From 880307cc01503d670b5022ba81d1d81d6a428a0d Mon Sep 17 00:00:00 2001
From: Cui YongXing <2835316714@qq.com>
Date: Sun, 8 Sep 2024 20:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5=E6=9D=A1?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloud-task-server/pom.xml                     |  5 +++++
 .../service/impl/TaskInfoServiceImpl.java     | 21 ++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)

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 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-rule-server</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
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<TaskInfoMapper, TaskInfo> i
     /**
      * 存放实例化引擎的容器
      */
-    public static Map<String, BasicEngine<DataValue>> engineMap = new ConcurrentHashMap<>();
-    public static Map<String, BasicEngine<DataValue[]>> engineRowMap = new ConcurrentHashMap<>();
-    public static Map<String, BasicEngine<DataValue[][]>> engineDataSetMap = new ConcurrentHashMap<>();
+
+
+
+
 
     private void executeTheRule(DataValue[][] dataValues, HashMap<String, String> map, Long newBasicId,
                                 Long tableId, Long taskId) {
@@ -397,19 +397,10 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
             Callable<DataValue[][]> task = () -> {
                 DataValue[][] prevResult = finalCurrentFuture.get();
                 if (data.getRuleId().equals("3")) {
-                    BasicEngine<DataValue[][]> 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<DataValue> dataValueBasicEngine = engineMap.get(data.getClassName());
-                            dataValueBasicEngine.set(value);
-                            dataValueBasicEngine.execution();
-                        }
-                    }
+
                 }
                 return prevResult;
             };