diff --git a/cloud-rule-engine/src/main/java/com/muyu/engine/basic/BasicEngine.java b/cloud-rule-engine/src/main/java/com/muyu/engine/basic/BasicEngine.java index 3d13092..fb95449 100644 --- a/cloud-rule-engine/src/main/java/com/muyu/engine/basic/BasicEngine.java +++ b/cloud-rule-engine/src/main/java/com/muyu/engine/basic/BasicEngine.java @@ -1,7 +1,7 @@ package com.muyu.engine.basic; import com.muyu.common.domain.DataValue; -import com.muyu.engine.basic.handler.DataEngineValueHandler; +import com.muyu.engine.basic.handler.DataEngineHandler; /** * @Author:蓬叁 @@ -19,7 +19,7 @@ public interface BasicEngine { public V get(); public default void remove(){ - DataEngineValueHandler.remove(); + DataEngineHandler.remove(); } public void execution(); diff --git a/cloud-rule-engine/src/main/java/com/muyu/engine/basic/BasicRecordEngine.java b/cloud-rule-engine/src/main/java/com/muyu/engine/basic/BasicRecordEngine.java deleted file mode 100644 index 0ddd8f0..0000000 --- a/cloud-rule-engine/src/main/java/com/muyu/engine/basic/BasicRecordEngine.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.muyu.engine.basic; - -import com.muyu.common.domain.DataValue; -import com.muyu.engine.basic.handler.DataEngineRecordHandler; -import com.muyu.engine.basic.handler.DataEngineValueHandler; - -/** - * @Author:蓬叁 - * @Package:com.muyu.engine.basic - * @Project:cloud-rule - * @name:BasicEngin - * @Date:2024/8/29 下午3:13 - * @Description: 规则引擎基准 - */ -public interface BasicRecordEngine { - - public void set(DataValue[] dataValue); - - //获取原始值 - public V get(); - - public default void remove(){ - DataEngineRecordHandler.remove(); - } - - public void execution(); -} diff --git a/cloud-rule-engine/src/main/java/com/muyu/engine/basic/abstracts/DataEngineRecordActuator.java b/cloud-rule-engine/src/main/java/com/muyu/engine/basic/abstracts/DataEngineRecordActuator.java index 96ad96d..f5e589d 100644 --- a/cloud-rule-engine/src/main/java/com/muyu/engine/basic/abstracts/DataEngineRecordActuator.java +++ b/cloud-rule-engine/src/main/java/com/muyu/engine/basic/abstracts/DataEngineRecordActuator.java @@ -2,7 +2,6 @@ package com.muyu.engine.basic.abstracts; import com.muyu.common.domain.DataValue; import com.muyu.engine.basic.BasicEngine; -import com.muyu.engine.basic.BasicRecordEngine; import com.muyu.engine.basic.handler.DataEngineRecordHandler; /** @@ -13,13 +12,15 @@ import com.muyu.engine.basic.handler.DataEngineRecordHandler; * @Date:2024/8/30 上午11:13 * @Description: 记录 */ -public abstract class DataEngineRecordActuator implements BasicRecordEngine { +public abstract class DataEngineRecordActuator implements BasicEngine { - public void set(DataValue[] dataValue){ + @Override + public void set(DataValue dataValue){ DataEngineRecordHandler.set(dataValue); } //获取原始值 + @Override public DataValue[] get(){ return DataEngineRecordHandler.get(); } @@ -27,7 +28,6 @@ public abstract class DataEngineRecordActuator implements BasicRecordEngine dataEngineRecordHandler = new ThreadLocal<>(); - public static void set(DataValue[] dataValue){ - DataEngineHandler.set(dataValue); + dataEngineRecordHandler.set(dataValue); } - public static DataValue[] get(){ - return DataEngineHandler.get(); - } - - public static void remove(){ - DataEngineHandler.remove(); - } - - public static Object getValue(){ - return get().getClass(); + public static DataValue[] get() { + return dataEngineRecordHandler.get(); } } diff --git a/cloud-rule-engine/src/main/java/com/muyu/generate/GenerateRecordQWEQWE.java b/cloud-rule-engine/src/main/java/com/muyu/generate/GenerateRecordQWEQWE.java index 3c64478..49cc74e 100644 --- a/cloud-rule-engine/src/main/java/com/muyu/generate/GenerateRecordQWEQWE.java +++ b/cloud-rule-engine/src/main/java/com/muyu/generate/GenerateRecordQWEQWE.java @@ -13,8 +13,10 @@ import com.muyu.engine.basic.abstracts.DataEngineRecordActuator; public class GenerateRecordQWEQWE extends DataEngineRecordActuator { @Override public void run() { - DataValue[] record = get(); - for (DataValue dataValue : record) { + DataRecord record = new DataRecord(); + DataValue[] dataValues = record.getDataValues(); + dataValues = get(); + for (DataValue dataValue : dataValues) { if (dataValue.getKey()!=null && dataValue.getValue()!=null && dataValue.getType() != null && dataValue.getLabel() != null) { System.out.println("数据正常:" + dataValue); } else {