From a39877067a15e7dffb9aba9fa8a364a9f644476a Mon Sep 17 00:00:00 2001
From: Cui YongXing <2835316714@qq.com>
Date: Tue, 10 Sep 2024 12:27:15 +0800
Subject: [PATCH] 1

---
 .../src/main/java/com/muyu/client/basic/RuleConfig.java     | 6 +++---
 .../java/com/muyu/client/basic/impl/RuleConfigImpl.java     | 6 +++---
 .../main/java/com/muyu/rule/remote/Factory/RuleFactory.java | 6 +++---
 .../src/main/java/com/muyu/rule/remote/RuleFeign.java       | 6 +++---
 .../rule/server/controller/RuleEngineVersionController.java | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cloud-rule-client/src/main/java/com/muyu/client/basic/RuleConfig.java b/cloud-rule-client/src/main/java/com/muyu/client/basic/RuleConfig.java
index 006a353..1cfe727 100644
--- a/cloud-rule-client/src/main/java/com/muyu/client/basic/RuleConfig.java
+++ b/cloud-rule-client/src/main/java/com/muyu/client/basic/RuleConfig.java
@@ -10,7 +10,7 @@ import com.muyu.rule.common.domain.RuleEngineVersion;
 public interface RuleConfig {
     public Result<RuleEngineVersion> findVersionById( Long id);
 
-    public Result testEngine(String className, DataValueFie dataValue);
-    public Result testEngine(String className, DataValueRow dataValue);
-    public Result DataSetEngine(String className, DataValueRows dataValues);
+    public Result<DataValue> testEngine(String className, DataValueFie dataValue);
+    public Result<DataValue[]> testEngine(String className, DataValueRow dataValue);
+    public Result<DataValue[][]> DataSetEngine(String className, DataValueRows dataValues);
 }
diff --git a/cloud-rule-client/src/main/java/com/muyu/client/basic/impl/RuleConfigImpl.java b/cloud-rule-client/src/main/java/com/muyu/client/basic/impl/RuleConfigImpl.java
index 906f331..23c5d6c 100644
--- a/cloud-rule-client/src/main/java/com/muyu/client/basic/impl/RuleConfigImpl.java
+++ b/cloud-rule-client/src/main/java/com/muyu/client/basic/impl/RuleConfigImpl.java
@@ -23,17 +23,17 @@ public class RuleConfigImpl implements RuleConfig {
     }
 
     @Override
-    public Result testEngine(String className, DataValueFie dataValue) {
+    public Result<DataValue> testEngine(String className, DataValueFie dataValue) {
         return ruleFeign.testEngine(className, dataValue);
     }
 
     @Override
-    public Result testEngine(String className, DataValueRow dataValue) {
+    public Result<DataValue[]> testEngine(String className, DataValueRow dataValue) {
         return ruleFeign.testEngine(className, dataValue);
     }
 
     @Override
-    public Result DataSetEngine(String className, DataValueRows dataValues) {
+    public Result<DataValue[][]> DataSetEngine(String className, DataValueRows dataValues) {
         return ruleFeign.DataSetEngine(className, dataValues);
     }
 }
diff --git a/cloud-rule-remote/src/main/java/com/muyu/rule/remote/Factory/RuleFactory.java b/cloud-rule-remote/src/main/java/com/muyu/rule/remote/Factory/RuleFactory.java
index c23133c..a08338b 100644
--- a/cloud-rule-remote/src/main/java/com/muyu/rule/remote/Factory/RuleFactory.java
+++ b/cloud-rule-remote/src/main/java/com/muyu/rule/remote/Factory/RuleFactory.java
@@ -26,19 +26,19 @@ public class RuleFactory implements FallbackFactory<RuleFeign> {
             }
 
             @Override
-            public Result testEngine(String className, DataValueFie dataValue) {
+            public Result<DataValue> testEngine(String className, DataValueFie dataValue) {
                 log.info(cause);
                 return Result.error("网络开小差......");
             }
 
             @Override
-            public Result testEngine(String className, DataValueRow dataValue) {
+            public Result<DataValue[]> testEngine(String className, DataValueRow dataValue) {
                 log.info(cause);
                 return Result.error("网络开小差......");
             }
 
             @Override
-            public Result DataSetEngine(String className, DataValueRows dataValues) {
+            public Result<DataValue[][]> DataSetEngine(String className, DataValueRows dataValues) {
                 log.info(cause);
                 return Result.error("网络开小差......");
             }
diff --git a/cloud-rule-remote/src/main/java/com/muyu/rule/remote/RuleFeign.java b/cloud-rule-remote/src/main/java/com/muyu/rule/remote/RuleFeign.java
index 88793d5..77066d5 100644
--- a/cloud-rule-remote/src/main/java/com/muyu/rule/remote/RuleFeign.java
+++ b/cloud-rule-remote/src/main/java/com/muyu/rule/remote/RuleFeign.java
@@ -21,9 +21,9 @@ 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 DataValueFie dataValue);
+    public Result<DataValue> testEngine(@PathVariable("className") String className,@RequestBody DataValueFie dataValue);
     @PostMapping("/version/rowEngine/{className}")
-    public Result testEngine(@PathVariable("className") String className,@RequestBody DataValueRow dataValue);
+    public Result<DataValue[]> testEngine(@PathVariable("className") String className,@RequestBody DataValueRow dataValue);
     @PostMapping("/version/DataSetEngine/{className}")
-    public Result DataSetEngine(@PathVariable("className") String className,@RequestBody DataValueRows dataValues);
+    public Result<DataValue[][]> DataSetEngine(@PathVariable("className") String className,@RequestBody DataValueRows dataValues);
 }
diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java
index c7598db..602779c 100644
--- a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java
+++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java
@@ -303,7 +303,7 @@ public Result<List<RuleEngineVersion>> selectVersionById(@PathVariable("id") Lon
 
     @PostMapping("/testEngine/{className}")
     @Operation(summary = "字段规则引擎测试", description = "传入规则引擎的类名,和数据,用规则引擎进行测试数据")
-    public Result testEngine(@PathVariable("className") String className,@RequestBody DataValueFie dataValue){
+    public Result<DataValue> testEngine(@PathVariable("className") String className,@RequestBody DataValueFie dataValue){
         log.info("数据:" + dataValue);
         //加载对应的规则引擎
         loadEngineClass.loadValueEngineClass(className);
@@ -315,7 +315,7 @@ public Result<List<RuleEngineVersion>> selectVersionById(@PathVariable("id") Lon
 
     @PostMapping("/rowEngine/{className}")
     @Operation(summary = "行/记录规则引擎测试", description = "传入规则引擎的类名,和数据,用规则引擎进行测试数据")
-    public Result testEngine(@PathVariable("className") String className,@RequestBody DataValueRow dataValue){
+    public Result<DataValue[]> testEngine(@PathVariable("className") String className,@RequestBody DataValueRow dataValue){
         log.info("数据:" + dataValue);
         //加载对应的规则引擎
         loadEngineClass.loadRowEngineClass(className);
@@ -326,7 +326,7 @@ public Result<List<RuleEngineVersion>> selectVersionById(@PathVariable("id") Lon
     }
 @PostMapping("/DataSetEngine/{className}")
 @Operation(summary = "数据集的规则引擎测试", description = "传入规则引擎的类名,和数据,用规则引擎进行测试数据")
-public Result DataSetEngine(@PathVariable("className") String className,@RequestBody DataValueRows dataValues){
+public Result<DataValue[][]> DataSetEngine(@PathVariable("className") String className,@RequestBody DataValueRows dataValues){
 
     loadEngineClass.loadDataSetEngineClass(className);