From 825ddaf79efa635c6feec4b0298d4daf68a9892d Mon Sep 17 00:00:00 2001
From: Cui YongXing <2835316714@qq.com>
Date: Tue, 10 Sep 2024 15:00:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E6=97=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskInfoServiceImpl.java     | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

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 b11e322..f9887c0 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
@@ -409,25 +409,28 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
                         DataValueRows dataValueRows = new DataValueRows();
                         dataValueRows.setDataValue(prevResult);
                         dataValueRows.setKey(nodeRule.getConfig());
-                        ruleConfig.DataSetEngine(data.getClassName(),dataValueRows);
+                        Result<DataValue[][]> result1 = ruleConfig.DataSetEngine(data.getClassName(), dataValueRows);
+                        if (result1.getCode() == 200) {
+                            prevResult = result1.getData();
+                        }
                     }
                     if (data.getRuleId().equals("1")) {
-                    for (DataValue[] values : prevResult) {
-                        for (DataValue value : values) {
-                            //log.info(value.getValue());
-                            try {
+                        for (int i = 0; i < prevResult.length; i++) {
+                            for (DataValue value : prevResult[i]) {
+                                //log.info(value.getValue());
                                 DataValueFie dataValueFie = new DataValueFie();
                                 dataValueFie.setDataValue(value);
                                 dataValueFie.setKey(nodeRule.getConfig());
                                 //DataValue dataValue = loadEngineClass.testEngine(data.getClassName(), value);
                                 Result<DataValue> dataValueResult = ruleConfig.testEngine(data.getClassName(), dataValueFie);
-                                DataValue data1 = dataValueResult.getData();
-                                value=data1;
-                            } catch (Exception e) {
-                                log.error(e.getMessage());
+                                if (dataValueResult.getCode() == 200) {
+                                    DataValue data1 = dataValueResult.getData();
+                                    value = data1;
+                                }else {
+                                    set.add(i);
+                                }
                             }
                         }
-                    }
 
                     }
                     if (data.getRuleId().equals("2")) {
@@ -436,10 +439,10 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
                             valueRow.setDataValue(prevResult[i]);
                             valueRow.setKey(nodeRule.getConfig());
                             Result<DataValue[]> result1 = ruleConfig.testEngine(data.getClassName(), valueRow);
-                            if (result1.getCode()==200){
+                            if (result1.getCode() == 200) {
                                 DataValue[] result1Data = result1.getData();
-                                prevResult[i]=result1Data;
-                            }else {
+                                prevResult[i] = result1Data;
+                            } else {
                                 set.add(i);
                             }
                         }