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 5c3eb37..4e8d120 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 @@ -14,8 +14,8 @@ import com.muyu.common.domian.req.TaskInfoListReq; import com.muyu.common.domian.resp.TaskInfoResp; import com.muyu.remote.feign.DatasourceFeign; import com.muyu.remote.feign.RuleFeign; -import com.muyu.rule.common.basic.BasicEngine; import com.muyu.rule.common.domain.RuleEngineVersion; +import com.muyu.rule.common.utils.LoadEngineClass; import com.muyu.task.server.mapper.TaskInfoMapper; import com.muyu.task.server.service.*; import com.muyu.task.server.thread.OptimizedPrioritizedThreadPool; @@ -29,8 +29,6 @@ import javax.annotation.Resource; import java.util.*; import java.util.concurrent.*; -import static com.muyu.rule.common.map.EngineHashMap.engineDataSetMap; -import static com.muyu.rule.common.map.EngineHashMap.engineMap; import static com.muyu.task.server.thread.OptimizedPrioritizedThreadPool.*; /** @@ -370,8 +368,8 @@ public class TaskInfoServiceImpl extends ServiceImpl i * 存放实例化引擎的容器 */ - - + @Autowired + private LoadEngineClass loadEngineClass; private void executeTheRule(DataValue[][] dataValues, HashMap map, Long newBasicId, Long tableId, Long taskId) { @@ -404,13 +402,16 @@ public class TaskInfoServiceImpl extends ServiceImpl i } if (data.getRuleId().equals("1")) { -// for (DataValue[] values : prevResult) { -// for (DataValue value : values) { -// log.info(value.getValue()); -// Result result1 = ruleFeign.testEngine(data.getClassName(), value); -// log.info(result1); -// } -// } + for (DataValue[] values : prevResult) { + for (DataValue value : values) { + log.info(value.getValue()); + try { + DataValue dataValue = loadEngineClass.testEngine(data.getClassName(), value); + } catch (Exception e) { + log.error(e.getMessage()); + } + } + } } if (data.getRuleId().equals("2")) {