From 635e3f5d01750496b4f933ac1892b05df73be65b Mon Sep 17 00:00:00 2001
From: Cui YongXing <2835316714@qq.com>
Date: Sun, 8 Sep 2024 22:01:35 +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

---
 .../src/main/java/com/muyu/remote/feign/RuleFeign.java       | 5 +++++
 .../muyu/task/server/service/impl/TaskInfoServiceImpl.java   | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cloud-task-remote/src/main/java/com/muyu/remote/feign/RuleFeign.java b/cloud-task-remote/src/main/java/com/muyu/remote/feign/RuleFeign.java
index 9edd353..d354ab0 100644
--- a/cloud-task-remote/src/main/java/com/muyu/remote/feign/RuleFeign.java
+++ b/cloud-task-remote/src/main/java/com/muyu/remote/feign/RuleFeign.java
@@ -1,14 +1,19 @@
 package com.muyu.remote.feign;
 
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.domain.DataValue;
 import com.muyu.remote.feign.Factory.RuleFactory;
 import com.muyu.rule.common.domain.RuleEngineVersion;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(value = "cloud-etl-rule",fallbackFactory= RuleFactory.class)
 public interface RuleFeign {
     @PostMapping("/version/findVersionById/{id}")
     public Result<RuleEngineVersion> findVersionById(@PathVariable("id") Long id);
+    @PostMapping("/version/testEngine/{className}")
+    public Result testEngine(@PathVariable("className") String className,@RequestBody DataValue dataValue);
 }
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 d22506d..f8bd06a 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
@@ -398,6 +398,7 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
             log.info(finalCurrentFuture);
             Callable<DataValue[][]> task = () -> {
                 DataValue[][] prevResult = finalCurrentFuture.get();
+                log.info(data.getClassName());
                 if (data.getRuleId().equals("3")) {
                     BasicEngine<DataValue[][]> basicEngine = engineDataSetMap.get(data.getClassName());
                     basicEngine.set(prevResult);
@@ -407,9 +408,7 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
                 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();
+                            ruleFeign.testEngine(data.getClassName(),value);
                         }
                     }