2023年04月26 任务枚举优化

middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/common/GenericAttribute.java

@@ -44,4 +44,6 @@ public class GenericAttribute {
     public static final String FIX_TAG = "fixTag";
 
     public static final String KEY = "task";
+
+    public static final String URL = "url";
 }

middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/pojo/enums/TaskType.java

@@ -3,9 +3,9 @@ package com.zhiwei.middleware.automatic.server.pojo.enums;
 public enum TaskType {
     COMMON_ONE("common_one","common", "commonCache"),
     COMMON_TWO("common_two","common", "commonCache"),
-    TEMPLATE("template", "template", ""),
-    TEMPLATE_MODIFY("template_modify","template", ""),
-    TEMPLATE_RESET("template_reset","template", "");
+    TEMPLATE("template", "template", null),
+    TEMPLATE_MODIFY("template_modify","template", null),
+    TEMPLATE_RESET("template_reset","template", null);
 
     final String type;
     final String name;

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/TaskManager.java

@@ -49,23 +49,13 @@ public class TaskManager implements ApplicationRunner {
 
     public void pullTask() {
         try {
-            List<AutoTask> tasks = redissonUtil.pullQueue(GenericAttribute.KEY, LIMIT)
-                    .stream()
-                    .map(e -> JSONObject.parseObject(e).toJavaObject(AutoTask.class))
-                    .collect(Collectors.toList());
-            tasks.forEach(e -> {
-                TaskType taskType = Objects.requireNonNull(TaskType.create(e.getType()));
-                TaskService taskService = TaskServiceHandler.getInstance()
-                        .getTaskService(taskType.getName());
-                if (taskService.thresholdWarn()) {
-                    log.error("任务类型：{}，当前运行任务已到达最大核心数", taskService.getTaskType());
+            for (String s : redissonUtil.pullQueue(GenericAttribute.KEY, LIMIT)) {
+                AutoTask autoTask = JSONObject.parseObject(s).toJavaObject(AutoTask.class);
+                String cacheId = TaskServiceHandler.getInstance().taskExecute(autoTask);
+                if (!Strings.isEmpty(cacheId)) {
+                    redissonUtil.deleteList(autoTask.getParamSource().getString(cacheId));
                 }
-                log.info("任务类型：{}，开始执行，信息：{}", taskService.getTaskType(), JSONObject.toJSONString(e));
-                taskService.runTask(e);
-                if (!Strings.isEmpty(taskType.getCacheId())) {
-                    redissonUtil.deleteList(e.getParamSource().getString(taskType.getCacheId()));
-                }
-            });
+            }
         } catch (Exception e) {
             log.error("任务管理器，任务执行失败：", e);
         }

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/holder/TaskServiceHandler.java

 package com.zhiwei.middleware.automatic.son.task.holder;
 
+import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.middleware.automatic.server.pojo.AutoTask;
+import com.zhiwei.middleware.automatic.server.pojo.enums.TaskType;
 import com.zhiwei.middleware.automatic.son.task.service.TaskService;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.context.ApplicationContext;
 
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public class TaskServiceHandler {
 
-    private static final Map<String, TaskService> SERVICE_MAP = new HashMap<>();
+    private static final Logger log = LogManager.getLogger(TaskServiceHandler.class);
+
+    private static final List<TaskService> SERVICE_LIST = new ArrayList<>();
 
     private TaskServiceHandler() {
         ApplicationContext applicationContext = ApplicationContextHolder.getInstance();
         Map<String, TaskService> beansOfType = applicationContext.getBeansOfType(TaskService.class);
-        beansOfType.forEach((k, v) -> SERVICE_MAP.put(v.getTaskType(), v));
+        beansOfType.forEach((k, v) -> SERVICE_LIST.add(v));
     }
 
     public static TaskServiceHandler getInstance() {
         return TaskServiceHandlerHolder.TASK_SERVICE_HANDLER;
     }
 
-    public TaskService getTaskService(String type) {
-        return SERVICE_MAP.get(type);
+    public String taskExecute(AutoTask autoTask) {
+        for (TaskService taskService : SERVICE_LIST) {
+            TaskType taskType = taskService.supports(autoTask.getType());
+            if (Objects.nonNull(taskType)) {
+                if (taskService.thresholdWarn()) {
+                    log.error("任务类型：{}，当前运行任务已到达最大核心数", autoTask.getType());
+                }
+                log.info("任务类型：{}，开始执行，信息：{}", autoTask.getType(), JSONObject.toJSONString(autoTask));
+                taskService.runTask(autoTask);
+                return taskType.getCacheId();
+            }
+        }
+        return null;
     }
 
     private static class TaskServiceHandlerHolder {

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskService.java

 package com.zhiwei.middleware.automatic.son.task.service;
 
 import com.zhiwei.middleware.automatic.server.pojo.AutoTask;
+import com.zhiwei.middleware.automatic.server.pojo.enums.TaskType;
 
 
 public interface TaskService {
 
     /**
-     * 回去任务名字
+     * 任务类型匹配
      * @return 名字
      */
-    String getTaskType();
+    TaskType supports(String type);
 
     /**
      * 任务运行

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceCommon.java

@@ -16,6 +16,7 @@ import com.zhiwei.middleware.automatic.son.util.CosineSimilarity;
 import com.zhiwei.middleware.automatic.son.util.MarkInfoUtil;
 import com.zhiwei.middleware.automatic.son.util.RedissonUtil;
 import com.zhiwei.middleware.automatic.son.util.Tools;
+import javafx.util.Pair;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -31,6 +32,8 @@ public class TaskServiceCommon implements TaskService {
 
     private static final Logger log = LogManager.getLogger(TaskServiceCommon.class);
 
+    private static final Map<String, Pair<TaskType, TaskCommonFunctional>> TYPE_MAP = new HashMap<>();
+
     private final RedissonUtil redissonUtil;
 
     private final TemplateTitleService templateTitleService;
@@ -46,18 +49,22 @@ public class TaskServiceCommon implements TaskService {
                              @Qualifier("autMarkExecutor") ThreadPoolTaskExecutor autoMarkExecutor) {
         this.redissonUtil = redissonUtil;
         this.templateTitleService = templateTitleService;
-            this.dubboHandler = dubboHandler;
+        this.dubboHandler = dubboHandler;
         this.autoMarkExecutor = autoMarkExecutor;
+        TYPE_MAP.put(TaskType.COMMON_TWO.getType(), new Pair<>(TaskType.COMMON_TWO, this::getMultiAutoInfo));
+        TYPE_MAP.put(TaskType.COMMON_ONE.getType(), new Pair<>(TaskType.COMMON_ONE, this::getOneAutoInfo));
     }
 
     @Override
-    public String getTaskType() {
-        return TaskType.COMMON_ONE.getName();
+    public TaskType supports(String type) {
+        Pair<TaskType, TaskCommonFunctional> pair = TYPE_MAP.get(type);
+        return Objects.isNull(pair) ? null : pair.getKey();
     }
 
     @Override
     public void runTask(AutoTask autoTask) {
-        Map<String, List<MarkInfo>> dataSourceInfo = getDataSourceInfo(autoTask);
+        Pair<TaskType, TaskCommonFunctional> pair = Objects.requireNonNull(TYPE_MAP.get(autoTask.getType()));
+        Map<String, List<MarkInfo>> dataSourceInfo = pair.getValue().getDataSource(autoTask.getParamSource().getString(pair.getKey().getCacheId()));
         if (dataSourceInfo.isEmpty()) {
             log.error("本地任务可用数据为空,taskType:{}", autoTask.getType());
         }
@@ -70,23 +77,6 @@ public class TaskServiceCommon implements TaskService {
     }
 
     /**
-     * 获取源数据
-     * @param autoTask 任务
-     * @return 源数据按项目分组
-     */
-    private Map<String, List<MarkInfo>> getDataSourceInfo(AutoTask autoTask) {
-        TaskType taskType = TaskType.create(autoTask.getType());
-        switch (Objects.requireNonNull(taskType)) {
-            case COMMON_ONE:
-                return getOneAutoInfo(autoTask.getParamSource().getString(taskType.getCacheId()));
-            case COMMON_TWO:
-                return getMultiAutoInfo(autoTask.getParamSource().getString(taskType.getCacheId()));
-            default:
-                return new HashMap<>();
-        }
-    }
-
-    /**
      * 获取单个项目标注源数据
      * @param key redis缓存key
      * @return 源数据按项目分组
@@ -265,4 +255,10 @@ public class TaskServiceCommon implements TaskService {
         return null;
     }
 
+    @FunctionalInterface
+    public interface TaskCommonFunctional {
+        Map<String, List<MarkInfo>> getDataSource(String group);
+    }
+
 }
+

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceTemplate.java

@@ -15,6 +15,7 @@ import com.zhiwei.middleware.automatic.son.util.CosineSimilarity;
 import com.zhiwei.middleware.automatic.son.util.Tools;
 import com.zhiwei.nlp.AggreeBootStarter;
 import com.zhiwei.nlp.vo.KResult;
+import javafx.util.Pair;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -27,10 +28,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
@@ -39,6 +37,8 @@ public class TaskServiceTemplate implements TaskService {
 
     private final Logger log = LogManager.getLogger(TaskServiceTemplate.class);
 
+    private static final Map<String, Pair<TaskType, TaskTemplateFunctional>> TYPE_MAP = new HashMap<>();
+
     private final TemplateTitleService templateTitleService;
 
     private final EsDao esDao;
@@ -57,16 +57,23 @@ public class TaskServiceTemplate implements TaskService {
         this.esDao = esDao;
         this.esIndexes = esIndexes;
         this.executor = executor;
+        TYPE_MAP.put(TaskType.TEMPLATE.getType(), new Pair<>(TaskType.TEMPLATE, this::runTask));
+        TYPE_MAP.put(TaskType.TEMPLATE_MODIFY.getType(), new Pair<>(TaskType.TEMPLATE_MODIFY, this::templateModify));
+        TYPE_MAP.put(TaskType.TEMPLATE_RESET.getType(), new Pair<>(TaskType.TEMPLATE_RESET, this::templateReset));
     }
 
     @Override
-    public String getTaskType() {
-        return TaskType.TEMPLATE.getName();
+    public TaskType supports(String type) {
+        Pair<TaskType, TaskTemplateFunctional> par = TYPE_MAP.get(type);
+        return Objects.isNull(par) ? null : par.getKey();
     }
 
     @Override
     public void runTask(AutoTask autoTask) {
-        executor.execute(() -> switchTask(autoTask));
+        executor.execute(() -> {
+            Pair<TaskType, TaskTemplateFunctional> pair = Objects.requireNonNull(TYPE_MAP.get(autoTask.getType()));
+            pair.getValue().template(autoTask.getParamSource());
+        });
     }
 
     @Override
@@ -75,27 +82,35 @@ public class TaskServiceTemplate implements TaskService {
         return false;
     }
 
-    private void switchTask (AutoTask autoTask) {
-        JSONObject paramSource = autoTask.getParamSource();
-        String group = paramSource.getString(GenericAttribute.GROUP_PARAM);
-        switch (Objects.requireNonNull(TaskType.create(autoTask.getType()))) {
-            case TEMPLATE_RESET:
-                templateTitleService.resetTemplate(group, paramSource.getString(GenericAttribute.TEMPLATE_TITLE));
-                break;
-            case TEMPLATE_MODIFY:
-                templateTitleService.modifyTemplateTitle(group, paramSource.getString(GenericAttribute.TEMPLATE_TITLE),
-                        paramSource.getString(GenericAttribute.FIX_TAG));
-                break;
-            case TEMPLATE:
-                runTask(group, paramSource.getLong(GenericAttribute.START_PARAM), paramSource.getLong(GenericAttribute.END_PARAM));
-                break;
-        }
+    /**
+     * 模板修改任务
+     * @param json 参数
+     */
+    private void templateModify(JSONObject json) {
+        templateTitleService.modifyTemplateTitle(json.getString(GenericAttribute.GROUP_PARAM), json.getString(GenericAttribute.TEMPLATE_TITLE),
+                json.getString(GenericAttribute.FIX_TAG));
+
     }
 
-    private void runTask(String group, Long startTime, Long endTime) {
+    /**
+     * 模板重置任务
+     * @param json 参数
+     */
+    private void templateReset(JSONObject json) {
+        templateTitleService.resetTemplate(json.getString(GenericAttribute.GROUP_PARAM), json.getString(GenericAttribute.TEMPLATE_TITLE));
+    }
+
+    /**
+     * 模板构建任务
+     * @param json 参数
+     */
+    private void runTask(JSONObject json) {
+        String group = json.getString(GenericAttribute.GROUP_PARAM);
         try {
+            Long startTime = json.getLong(GenericAttribute.START_PARAM);
+            Long endTime = json.getLong(GenericAttribute.END_PARAM);
             //源数据
-            List<Map<String, Object>> sourceList = findRecentTimeData(group,startTime,
+            List<Map<String, Object>> sourceList = findRecentTimeData(group, startTime,
                     endTime);
             if (sourceList.isEmpty()) {
                 return;
@@ -230,4 +245,9 @@ public class TaskServiceTemplate implements TaskService {
     private QueryBuilder autoRobotQueryBuilder() {
         return QueryBuilders.termQuery("mperson", GenericAttribute.AUTO_PERSON);
     }
+
+    @FunctionalInterface
+    public interface TaskTemplateFunctional {
+        void template(JSONObject json);
+    }
 }