refactor: 重构WebSocket服务及相关实体类
重构WebSocket服务名称从WebSocketService改为WebSocketClientService,并实现Serializable接口 添加WebSocket常量定义和消息处理实现 优化实体类equals和hashCode方法 修复控制器路径和日志配置 添加查询服务和任务接口方法
This commit is contained in:
@@ -1,4 +1,21 @@
|
||||
package com.ecep.contract.ui;
|
||||
|
||||
public class MessageHolderImpl {
|
||||
import com.ecep.contract.MessageHolder;
|
||||
|
||||
import java.util.logging.Level;
|
||||
|
||||
/**
|
||||
* 错误消息处理
|
||||
*/
|
||||
public class MessageHolderImpl implements MessageHolder {
|
||||
private final Tasker tasker;
|
||||
|
||||
public MessageHolderImpl(Tasker<?> tasker) {
|
||||
this.tasker = tasker;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addMessage(Level level, String message) {
|
||||
tasker.updateMessage(level, message);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.ecep.contract.ui;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Locale;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
@@ -26,6 +27,11 @@ public abstract class Tasker<T> implements java.util.concurrent.Callable<T> {
|
||||
@Setter
|
||||
private java.util.function.Predicate<String> titleHandler;
|
||||
@Setter
|
||||
private BiConsumer<String, Object> propertyHandler;
|
||||
@Setter
|
||||
private BiConsumer<Long, Long> progressHandler;
|
||||
@Getter
|
||||
@Setter
|
||||
private Locale locale = Locale.getDefault();
|
||||
private HashMap<Class<?>, Object> cachedMap = new HashMap<>();
|
||||
@Setter
|
||||
@@ -34,6 +40,7 @@ public abstract class Tasker<T> implements java.util.concurrent.Callable<T> {
|
||||
@Getter
|
||||
private boolean cancelled = false;
|
||||
|
||||
|
||||
public SysConfService getConfService() {
|
||||
return getCachedBean(SysConfService.class);
|
||||
}
|
||||
@@ -66,7 +73,7 @@ public abstract class Tasker<T> implements java.util.concurrent.Callable<T> {
|
||||
|
||||
@Override
|
||||
public T call() throws Exception {
|
||||
MessageHolderImpl holder = new MessageHolderImpl();
|
||||
MessageHolderImpl holder = new MessageHolderImpl(this);
|
||||
try {
|
||||
return execute(holder);
|
||||
} catch (Exception e) {
|
||||
@@ -99,23 +106,19 @@ public abstract class Tasker<T> implements java.util.concurrent.Callable<T> {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 错误消息处理
|
||||
*/
|
||||
public class MessageHolderImpl implements MessageHolder {
|
||||
public MessageHolderImpl() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addMessage(Level level, String message) {
|
||||
updateMessage(level, message);
|
||||
public void updateProgress(long current, long total) {
|
||||
if (progressHandler != null) {
|
||||
progressHandler.accept(current, total);
|
||||
}
|
||||
}
|
||||
|
||||
public Locale getLocale() {
|
||||
return locale;
|
||||
public void updateProgress(double current, double total) {
|
||||
updateProgress((long) (current * 1000), (long) (total * 1000));
|
||||
}
|
||||
|
||||
public void updateProgress(double d, double total) {
|
||||
public void updateProperty(String property, Object value) {
|
||||
if (propertyHandler != null) {
|
||||
propertyHandler.accept(property, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user