diff --git a/cloud-task-server/pom.xml b/cloud-task-server/pom.xml index ac052b2..f3fd7b8 100644 --- a/cloud-task-server/pom.xml +++ b/cloud-task-server/pom.xml @@ -19,6 +19,11 @@ + + com.muyu + cloud-rule-server + 1.0.0 + com.alibaba.cloud diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java index 5292e8a..33cdeff 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java @@ -3,7 +3,6 @@ package com.muyu.task.server.service.impl; import com.muyu.common.domian.*; import com.muyu.common.domian.basic.abstracts.DataTaskAbstracts; import com.muyu.remote.feign.RuleFeign; -import com.muyu.rule.common.basic.BasicEngine; import com.muyu.rule.common.domain.RuleEngineVersion; import com.muyu.task.server.service.*; import com.muyu.task.server.thread.OptimizedPrioritizedThreadPool; @@ -367,9 +366,10 @@ public class TaskInfoServiceImpl extends ServiceImpl i /** * 存放实例化引擎的容器 */ - public static Map> engineMap = new ConcurrentHashMap<>(); - public static Map> engineRowMap = new ConcurrentHashMap<>(); - public static Map> engineDataSetMap = new ConcurrentHashMap<>(); + + + + private void executeTheRule(DataValue[][] dataValues, HashMap map, Long newBasicId, Long tableId, Long taskId) { @@ -397,19 +397,10 @@ public class TaskInfoServiceImpl extends ServiceImpl i Callable task = () -> { DataValue[][] prevResult = finalCurrentFuture.get(); if (data.getRuleId().equals("3")) { - BasicEngine basicEngine = engineDataSetMap.get(data.getClassName()); - basicEngine.set(prevResult); - basicEngine.execution(); - DataValue[][] dataValues1 = basicEngine.get(); + } if (data.getRuleId().equals("1")) { - for (DataValue[] values : prevResult) { - for (DataValue value : values) { - BasicEngine dataValueBasicEngine = engineMap.get(data.getClassName()); - dataValueBasicEngine.set(value); - dataValueBasicEngine.execution(); - } - } + } return prevResult; };