From c79f4f974f70ac1ca49d178bfb0a323560b4724e Mon Sep 17 00:00:00 2001 From: zhang chengzhi <3144712872@qq.com> Date: Sun, 8 Sep 2024 11:41:32 +0800 Subject: [PATCH] 11111 --- .../abstracts/DataEngineDataSetActuator.java | 4 + .../{dataSet => }/ENGINE_DataSet_asdf_S1.java | 2 +- .../ENGINE_DataSet_ytrrt_S2.java | 2 +- .../common/engine}/ENGINE_ROW_HANG_R1.java | 2 +- .../engine}/ENGINE_VALUE_VFD1000_V1.java | 2 +- .../engine}/ENGINE_VALUE_VFD1000_V2.java | 2 +- .../engine}/ENGINE_VALUE_VFD1000_V3.java | 2 +- .../common/engine/row/ENGINE_ROW_HANG_R1.java | 40 --- .../engine/value/ENGINE_VALUE_VFD1000_V1.java | 24 -- .../engine/value/ENGINE_VALUE_VFD1000_V2.java | 45 --- .../engine/value/ENGINE_VALUE_VFD1000_V3.java | 26 -- .../server/DownloadOssSynchronization.java | 2 +- .../main/java/com/muyu/rule/server/Main.java | 8 +- .../rule/server/OSSClassLoaderExample.java | 4 +- .../RuleEngineVersionController.java | 19 +- .../impl/RuleEngineVersionServiceImpl.java | 4 +- .../muyu/rule/common/basic/BasicEngine.class | Bin 0 -> 655 bytes .../muyu/rule/common/basic/BasicEngine.java | 25 -- .../abstracts/DataEngineDataSetActuator.class | Bin 0 -> 1555 bytes .../abstracts/DataEngineDataSetActuator.java | 39 --- .../abstracts/DataEngineRowActuator.class | Bin 0 -> 1199 bytes .../abstracts/DataEngineRowActuator.java | 32 --- .../abstracts/DataEngineValueActuator.class | Bin 0 -> 1238 bytes .../abstracts/DataEngineValueActuator.java | 33 --- .../handler/DataEngineDataSetHandler.class | Bin 0 -> 750 bytes .../handler/DataEngineDataSetHandler.java | 21 -- .../basic/handler/DataEngineHandler.class | Bin 0 -> 897 bytes .../basic/handler/DataEngineHandler.java | 36 --- .../basic/handler/DataEngineRowHandler.class | Bin 0 -> 735 bytes .../basic/handler/DataEngineRowHandler.java | 20 -- .../handler/DataEngineValueHandler.class | Bin 0 -> 1117 bytes .../basic/handler/DataEngineValueHandler.java | 37 --- .../muyu/rule/common/domain/RuleEngine.class | Bin 0 -> 7651 bytes .../muyu/rule/common/domain/RuleEngine.java | 92 ------ .../common/domain/RuleEngineVersion.class | Bin 0 -> 8019 bytes .../rule/common/domain/RuleEngineVersion.java | 91 ------ .../muyu/rule/common/domain/RuleRegion.class | Bin 0 -> 2538 bytes .../muyu/rule/common/domain/RuleRegion.java | 28 -- .../common/domain/req/EtlRuleAddReq.class | Bin 0 -> 5711 bytes .../rule/common/domain/req/EtlRuleAddReq.java | 48 ---- .../common/domain/req/EtlRuleListReq.class | Bin 0 -> 4739 bytes .../common/domain/req/EtlRuleListReq.java | 42 --- .../common/domain/req/EtlRuleUpdReq.class | Bin 0 -> 5711 bytes .../rule/common/domain/req/EtlRuleUpdReq.java | 50 ---- .../common/domain/req/VersionAddReq.class | Bin 0 -> 6859 bytes .../rule/common/domain/req/VersionAddReq.java | 69 ----- .../rule/common/domain/resp/EtlRuleResp.class | Bin 0 -> 8592 bytes .../rule/common/domain/resp/EtlRuleResp.java | 92 ------ .../engine/ENGINE_DataSet_asdf_S1.class | Bin 0 -> 964 bytes .../engine/ENGINE_DataSet_ytrrt_S2.class | Bin 0 -> 1732 bytes .../common/engine/ENGINE_ROW_HANG_R1.class | Bin 0 -> 1366 bytes .../engine/ENGINE_VALUE_VFD1000_V1.class | Bin 0 -> 1425 bytes .../engine/ENGINE_VALUE_VFD1000_V2.class | Bin 0 -> 769 bytes .../engine/ENGINE_VALUE_VFD1000_V3.class | Bin 0 -> 580 bytes .../dataSet/ENGINE_DataSet_asdf_S1.java | 27 -- .../dataSet/ENGINE_DataSet_ytrrt_S2.java | 41 --- .../common/exception/DeliteException.class | Bin 0 -> 986 bytes .../common/exception/DeliteException.java | 30 -- .../rule/common/utils/Desensitization.class | Bin 0 -> 5367 bytes .../rule/common/utils/Desensitization.java | 271 ------------------ lib/com/muyu/rule/common/utils/OssUtil.class | Bin 0 -> 7728 bytes lib/com/muyu/rule/common/utils/OssUtil.java | 231 --------------- 62 files changed, 34 insertions(+), 1509 deletions(-) rename cloud-rule-common/src/main/java/com/muyu/rule/common/engine/{dataSet => }/ENGINE_DataSet_asdf_S1.java (94%) rename cloud-rule-common/src/main/java/com/muyu/rule/common/engine/{dataSet => }/ENGINE_DataSet_ytrrt_S2.java (95%) rename {lib/com/muyu/rule/common/engine/row => cloud-rule-common/src/main/java/com/muyu/rule/common/engine}/ENGINE_ROW_HANG_R1.java (96%) rename {lib/com/muyu/rule/common/engine/value => cloud-rule-common/src/main/java/com/muyu/rule/common/engine}/ENGINE_VALUE_VFD1000_V1.java (94%) rename {lib/com/muyu/rule/common/engine/value => cloud-rule-common/src/main/java/com/muyu/rule/common/engine}/ENGINE_VALUE_VFD1000_V2.java (96%) rename {lib/com/muyu/rule/common/engine/value => cloud-rule-common/src/main/java/com/muyu/rule/common/engine}/ENGINE_VALUE_VFD1000_V3.java (91%) delete mode 100644 cloud-rule-common/src/main/java/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.java delete mode 100644 cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.java delete mode 100644 cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.java delete mode 100644 cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java create mode 100644 lib/com/muyu/rule/common/basic/BasicEngine.class delete mode 100644 lib/com/muyu/rule/common/basic/BasicEngine.java create mode 100644 lib/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.class delete mode 100644 lib/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java create mode 100644 lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.class delete mode 100644 lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java create mode 100644 lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.class delete mode 100644 lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java create mode 100644 lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.class delete mode 100644 lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java create mode 100644 lib/com/muyu/rule/common/basic/handler/DataEngineHandler.class delete mode 100644 lib/com/muyu/rule/common/basic/handler/DataEngineHandler.java create mode 100644 lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.class delete mode 100644 lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java create mode 100644 lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.class delete mode 100644 lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java create mode 100644 lib/com/muyu/rule/common/domain/RuleEngine.class delete mode 100644 lib/com/muyu/rule/common/domain/RuleEngine.java create mode 100644 lib/com/muyu/rule/common/domain/RuleEngineVersion.class delete mode 100644 lib/com/muyu/rule/common/domain/RuleEngineVersion.java create mode 100644 lib/com/muyu/rule/common/domain/RuleRegion.class delete mode 100644 lib/com/muyu/rule/common/domain/RuleRegion.java create mode 100644 lib/com/muyu/rule/common/domain/req/EtlRuleAddReq.class delete mode 100644 lib/com/muyu/rule/common/domain/req/EtlRuleAddReq.java create mode 100644 lib/com/muyu/rule/common/domain/req/EtlRuleListReq.class delete mode 100644 lib/com/muyu/rule/common/domain/req/EtlRuleListReq.java create mode 100644 lib/com/muyu/rule/common/domain/req/EtlRuleUpdReq.class delete mode 100644 lib/com/muyu/rule/common/domain/req/EtlRuleUpdReq.java create mode 100644 lib/com/muyu/rule/common/domain/req/VersionAddReq.class delete mode 100644 lib/com/muyu/rule/common/domain/req/VersionAddReq.java create mode 100644 lib/com/muyu/rule/common/domain/resp/EtlRuleResp.class delete mode 100644 lib/com/muyu/rule/common/domain/resp/EtlRuleResp.java create mode 100644 lib/com/muyu/rule/common/engine/ENGINE_DataSet_asdf_S1.class create mode 100644 lib/com/muyu/rule/common/engine/ENGINE_DataSet_ytrrt_S2.class create mode 100644 lib/com/muyu/rule/common/engine/ENGINE_ROW_HANG_R1.class create mode 100644 lib/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V1.class create mode 100644 lib/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V2.class create mode 100644 lib/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V3.class delete mode 100644 lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.java delete mode 100644 lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_ytrrt_S2.java create mode 100644 lib/com/muyu/rule/common/exception/DeliteException.class delete mode 100644 lib/com/muyu/rule/common/exception/DeliteException.java create mode 100644 lib/com/muyu/rule/common/utils/Desensitization.class delete mode 100644 lib/com/muyu/rule/common/utils/Desensitization.java create mode 100644 lib/com/muyu/rule/common/utils/OssUtil.class delete mode 100644 lib/com/muyu/rule/common/utils/OssUtil.java diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java index cd50fc6..eb01724 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java @@ -13,11 +13,15 @@ import com.muyu.rule.common.basic.handler.DataEngineHandler; * @Date：2024/8/29 15:11 */ public abstract class DataEngineDataSetActuator implements BasicEngine { + + public void setDataValue(String dataValue){ DataEngineHandler.set(dataValue); } public String getDataValue(){return DataEngineHandler.get();} + + public void set(DataValue[][] dataValue){ DataEngineDataSetHandler.set(dataValue); } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_asdf_S1.java similarity index 94% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_asdf_S1.java index 2dc637d..f65afa5 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_asdf_S1.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.engine.dataSet; +package com.muyu.rule.common.engine; import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineDataSetActuator; diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_ytrrt_S2.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_ytrrt_S2.java similarity index 95% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_ytrrt_S2.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_ytrrt_S2.java index 4668402..c0b021e 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_ytrrt_S2.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_ytrrt_S2.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.engine.dataSet; +package com.muyu.rule.common.engine; import cn.hutool.core.util.DesensitizedUtil; import com.alibaba.fastjson2.JSON; diff --git a/lib/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_ROW_HANG_R1.java similarity index 96% rename from lib/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_ROW_HANG_R1.java index 892ded0..358c126 100644 --- a/lib/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_ROW_HANG_R1.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.engine.row; +package com.muyu.rule.common.engine; import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineRowActuator; diff --git a/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V1.java similarity index 94% rename from lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V1.java index 292175d..bccc9aa 100644 --- a/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V1.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.engine.value; +package com.muyu.rule.common.engine; import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; diff --git a/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V2.java similarity index 96% rename from lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V2.java index b07a38e..9ffb016 100644 --- a/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V2.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.engine.value; +package com.muyu.rule.common.engine; import com.muyu.common.domain.DataValue; import com.muyu.common.enums.DataType; diff --git a/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V3.java similarity index 91% rename from lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V3.java index 5115649..6cb10bc 100644 --- a/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V3.java @@ -1,4 +1,4 @@ -package com.muyu.rule.common.engine.value; +package com.muyu.rule.common.engine; import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.java deleted file mode 100644 index 892ded0..0000000 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/row/ENGINE_ROW_HANG_R1.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.muyu.rule.common.engine.row; - -import com.muyu.common.domain.DataValue; -import com.muyu.rule.common.basic.abstracts.DataEngineRowActuator; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.engine.row - * @Project：cloud-etl-rule - * @name：ENGINE_ROW_HANG_R1 - * @Date：2024/8/30 11:13 - */ -public class ENGINE_ROW_HANG_R1 extends DataEngineRowActuator { - - /** - * 数据行去重 - */ - @Override - public void run() { - DataValue[] dataValues = get(); - System.out.println(Arrays.toString(dataValues)); - // 使用 HashSet 去重 - Set uniquePeople = new HashSet<>(Arrays.asList(dataValues)); - - // 将 Set 转换回数组 - DataValue[] uniqueArray = uniquePeople.toArray(new DataValue[0]); - System.out.println(Arrays.toString(uniqueArray)); - set(uniqueArray); - DataValue[] dataValues1 = get(); - System.out.println(Arrays.toString(dataValues1)); - - - - } - -} diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.java deleted file mode 100644 index 292175d..0000000 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V1.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.rule.common.engine.value; - -import com.muyu.common.domain.DataValue; -import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; -import com.muyu.rule.common.exception.DeliteException; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.engine - * @Project：cloud-etl-rule - * @name：非空抛出异常 进行删除 - * @Date：2024/8/29 15:51 - */ -public class ENGINE_VALUE_VFD1000_V1 extends DataEngineValueActuator { - @Override - public void run() { - DataValue dataValue = get(); - if (dataValue.getValue() == null){ - throw new DeliteException("数据为空，需要丢弃!"); - }else{ - System.out.println("数据非空："+dataValue.getValue()); - } - } -} diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.java deleted file mode 100644 index b07a38e..0000000 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V2.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.muyu.rule.common.engine.value; - -import com.muyu.common.domain.DataValue; -import com.muyu.common.enums.DataType; -import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; - -import java.time.LocalDateTime; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.engine - * @Project：cloud-etl-rule - * @name：ENGINE_VALUE_VFD1000_V1 - * @Date：2024/8/29 15:51 - */ -public class ENGINE_VALUE_VFD1000_V2 extends DataEngineValueActuator { - @Override - public void run() { - - DataValue dataValue = get(); - - if (dataValue.getValue()==null){ - - DataType type = dataValue.getType(); - // 如果为空,添加默认值 - -//为整数 默认值为0 -// if ("Integer".equals(string)){ -// dataValue.setValue(0); -// } -// //为字符串 默认值为null -// if ("String".equals(string)){ -// dataValue.setValue(null); -// } -// //为时间 默认值为当前时间 -// if ("Date".equals(string)){ -// LocalDateTime dateTime = LocalDateTime.now(); -// dataValue.setValue(dateTime); -// } - } - - - - } -} diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java deleted file mode 100644 index 5115649..0000000 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.rule.common.engine.value; - -import com.muyu.common.domain.DataValue; -import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.engine - * @Project：cloud-etl-rule - * @name：字典字段 转换 - * @Date：2024/8/29 15:51 - */ -public class ENGINE_VALUE_VFD1000_V3 extends DataEngineValueActuator { - @Override - public void run() { - - DataValue dataValue = get(); - - - - - - - - } -} diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/DownloadOssSynchronization.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/DownloadOssSynchronization.java index 1f9925e..babf510 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/DownloadOssSynchronization.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/DownloadOssSynchronization.java @@ -38,7 +38,7 @@ public class DownloadOssSynchronization implements ApplicationRunner { /** * 服务器项目路径放文件 */ - private static String serverClassPath = "home/lib/com/muyu/rule/common/engine/value/"; + private static String serverClassPath = "home/lib/com/muyu/rule/common/engine/"; private static String bucketName = "zcz-vfd-1000"; diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java index 9e078da..bf752b3 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java @@ -23,10 +23,10 @@ public class Main { static Map> engineDataSetMap = new ConcurrentHashMap<>(); static { try { - Class aClass = Class.forName("com.muyu.rule.common.engine.value.ENGINE_VALUE_VFD1000_V1"); - Class aClass2 = Class.forName("com.muyu.rule.common.engine.value.ENGINE_VALUE_VFD1000_V2"); - Class aClass3 = Class.forName("com.muyu.rule.common.engine.row.ENGINE_ROW_HANG_R1"); - Class aClass4 = Class.forName("com.muyu.rule.common.engine.dataSet.ENGINE_DataSet_asdf_S1"); + Class aClass = Class.forName("com.muyu.rule.common.engine.ENGINE_VALUE_VFD1000_V1"); + Class aClass2 = Class.forName("com.muyu.rule.common.engine.ENGINE_VALUE_VFD1000_V2"); + Class aClass3 = Class.forName("com.muyu.rule.common.engine.ENGINE_ROW_HANG_R1"); + Class aClass4 = Class.forName("com.muyu.rule.common.engine.ENGINE_DataSet_asdf_S1"); try { engineMap.put("ENGINE_VALUE_VFD1000_V1", (BasicEngine) aClass.newInstance()); engineMap.put("ENGINE_VALUE_VFD1000_V2", (BasicEngine) aClass2.newInstance()); diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java index 891fa7d..7560c46 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java @@ -15,7 +15,7 @@ public class OSSClassLoaderExample { static Map> engineMap = new ConcurrentHashMap<>(); public static void main(String[] args) throws Exception { - String filePath = "cloud-rule-server/src/main/java/com/muyu/rule/server/basic/engine/value/"; + String filePath = "cloud-rule-server/src/main/java/com/muyu/rule/server/basic/engine/"; String pack = "com.muyu.rule.server.basic.engine.value."; @@ -52,7 +52,7 @@ public class OSSClassLoaderExample { Class aClass = null; try { - aClass = Class.forName("com.muyu.rule.common.engine.value.ENGINE_phone_zzzzz_V9"); + aClass = Class.forName("com.muyu.rule.common.engine.ENGINE_VALUE_VFD1000_V1"); BasicEngine object =(BasicEngine)aClass.newInstance(); 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 a0d1359..4f80af1 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 @@ -30,7 +30,6 @@ import java.util.List; @Tag(name = "规则版本控制层", description = "规则版本管理,查看等相关操作") public class RuleEngineVersionController { - /** * 保存代码 * @param ruleEngineVersion @@ -115,14 +114,25 @@ public class RuleEngineVersionController { //String versionClass = versionService.deposit(type); versionAddReq.setVersionClazz(""); + String parentClass = null; + if (type==1){ + parentClass = "DataEngineValueActuator"; + }else if (type==2){ + parentClass="DataEngineRowActuator"; + }else if (type==3){ + parentClass="DataEngineDataSetActuator"; + } - String template = "package com.muyu.rule.common.engine.value;\n" + + + + + String template = "package com.muyu.rule.common.engine;\n" + "\n" + "import cn.hutool.core.util.DesensitizedUtil;\n" + "import com.alibaba.fastjson2.JSON;\n" + "import com.alibaba.fastjson2.JSONObject;\n" + "import com.muyu.common.domain.DataValue;\n" + - "import com.muyu.rule.common.basic.abstracts.DataEngineDataSetActuator;\n" + + "import com.muyu.rule.common.basic.abstracts.${parentClass};\n" + "\n" + "\n" + "/**\n" + @@ -133,7 +143,7 @@ public class RuleEngineVersionController { " * @Date：2024/8/30 11:13\n" + " */\n" + "\n" + - "public class ${className} extends DataEngineDataSetActuator {\n" + + "public class ${className} extends ${parentClass} {\n" + "\n" + " @Override\n" + " public void run() {\n" + @@ -159,6 +169,7 @@ public class RuleEngineVersionController { "}\n"; String versionClass = template.replace("${className}", versionAddReq.getClassName()); + versionClass = template.replace("${parentClass}",parentClass); versionAddReq.setVersionClazz(versionClass); diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java index 433e7ea..b3b4988 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java @@ -118,7 +118,7 @@ public static final String importClassAndPackPath="home/lib/"; /** * 规则引擎的包的路径 */ - public static final String className_prefix = "com.muyu.rule.common.engine.value."; + public static final String className_prefix = "com.muyu.rule.common.engine."; /** * 服务器存放引擎的class文件的位置 @@ -126,7 +126,7 @@ public static final String importClassAndPackPath="home/lib/"; * @param versionClazz 源代码 */ - public static final String serverClassPath = "com/muyu/rule/common/engine/value/"; + public static final String serverClassPath = "com/muyu/rule/common/engine/"; //todo diff --git a/lib/com/muyu/rule/common/basic/BasicEngine.class b/lib/com/muyu/rule/common/basic/BasicEngine.class new file mode 100644 index 0000000000000000000000000000000000000000..caa3e6850b3beb3a75dfe8e42ee2acb88a891ca8 GIT binary patch literal 655 zcma))O;5r=5Qg8Sg$kk|0)Agjd(gdjQskg$JT!WM^u8?{DCvhOEs>w)&3Nz!_@j)o zphhGyr0MLwGds`h?C$%=>l=Ve9F>rRWwGZ=#Lppd$neW-(18@AHPv2D>7QN%{GCG@=1DG>c!~ vKT}yRV9zva*e0vq4rr#KP9J78T7w3fq;?iOyA)v9BciG{uepzdnL7Lgqfno| literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/basic/BasicEngine.java b/lib/com/muyu/rule/common/basic/BasicEngine.java deleted file mode 100644 index 3b83d0d..0000000 --- a/lib/com/muyu/rule/common/basic/BasicEngine.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.muyu.rule.common.basic; - -import com.muyu.rule.common.basic.handler.DataEngineHandler; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic - * @Project：cloud-etl-rule - * @name：BasicEngine - * @Date：2024/8/29 14:29 - */ -public interface BasicEngine { - - public void set(V dataValue); - - public V get(); - - public default void remove(){ - DataEngineHandler.remove(); - } - public void execution(); - - - -} diff --git a/lib/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.class b/lib/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.class new file mode 100644 index 0000000000000000000000000000000000000000..54af5623796f42f0cb47e5d21b76f58850de8427 GIT binary patch literal 1555 zcmbW1TT|0O6vzMD24ZT2T3QrP5T$o*RPZ(hM({E|bo8N4UwCnw?vyZXGLt5Zek*-J z#s`OIKa}IyB&MM#gFZBy-JbK$@7(ss&u`xWY~fi3DWp{>I;JqqkUijs+!%1XZ@lXs z2-9Pj-n4AX+h#~ts+|ljK~s^@aTz+phUpBAq5sJ@Tz?=8+6^7s=<<_#zsXOl z-;Td>HjTVH@?36uqeLPj(jC+Dx#zf)DA%{8=Bkd{QgGT8L+4P)qXiX3hP8`QQT8en z#yLQ{vbteG8I%`JPcY23sJw6eVOO~Cd3Qi3xt3${L5I7R+((Csw{MLYo{zKoU-32> zbm}0Pg`fr#trWHb6^23Ujcsy?CW=f*hdL~wbGp@HD@}Y9rtevfO_FV^Z*$LgDaa2A z$#7hn=Y^KY+~!5ysEO2@EC1*od>)jC{4)5tit8Ym733G{saTloDN)<%EzH3Mov^ zJdoXycU%NBF3%C}Ow# { - public void setDataValue(String dataValue){ - DataEngineHandler.set(dataValue); - } - public String getDataValue(){return DataEngineHandler.get();} - -public void set(DataValue[][] dataValue){ - DataEngineDataSetHandler.set(dataValue); -} - - -public DataValue[][] get(){ - return DataEngineDataSetHandler.get(); -} - - - @Override - public void execution() { - this.run(); - this.remove(); - } - - public abstract void run(); - -} diff --git a/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.class b/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.class new file mode 100644 index 0000000000000000000000000000000000000000..1e430775c9270b822ba2c7c0ca5ae8e71337cc9c GIT binary patch literal 1199 zcmb7DU2hUW6g>k=5xP=ZOI4^JwYDx`x(_~>2yIfo;sepd8eV)b!!n`UEW63FTlHV* z3pPF&pZ!tBGq3_Jrojj1?!DY|=G-$gzkYxJ0bm~w^GG3`g<&FtC4u6JJe9U5{hs}% zbE2F`V5#Z)Zge1!wyNzst{|61-o!FYfyYkJxBKzu*bZY)+06QZZ+GOtb?js5cRdx_ z&t)WE_&wKGZ-bAo#zm416uEb;_pJ#G~sBTY9l-jCU=VSV57%o(Aq%)di4w ztl?S~>n2KixF?gX=GDs1APS`u4bJO5bfQ>BLCAf>*w=j5P2A9AOQGrqr%IO!SyTkJ z7ZgPMZgcWWv^>@RjV%)}o&{Ycu+pM|uj774h3{m?V`Z%sIMQp&(A9ZTG@@g7Akdt; z`ro5A1ae)T*~ol;t53>_BRB8`)~#ym;ss%Q$(pZL+k_suJzqv~NVOm4TQ1W$V?lEP zUk|7ve-y-_qh7k&obtI__xBX{w0L8SN0x%XExv#(BQHMJJIriG!I-IigZRpi6z+1> ze**<Xo-*pBlb1&!4N+f1*6Z=2XqRtBDE%tkKX_)JC!X2ZJU6n*aa+ literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java b/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java deleted file mode 100644 index 0fd2672..0000000 --- a/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.rule.common.basic.abstracts; - -import com.muyu.common.domain.DataValue; -import com.muyu.rule.common.basic.BasicEngine; -import com.muyu.rule.common.basic.handler.DataEngineRowHandler; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.abstracts - * @Project：cloud-etl-rule - * @name：DataEngineValueAu - * @Date：2024/8/29 15:11 - */ -public abstract class DataEngineRowActuator implements BasicEngine { - -public void set(DataValue[] dataValue){ - DataEngineRowHandler.set(dataValue); -} - -public DataValue[] get(){ - return DataEngineRowHandler.get(); -} - - @Override - public void execution() { - this.run(); - this.remove(); - } - - public abstract void run(); - -} diff --git a/lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.class b/lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.class new file mode 100644 index 0000000000000000000000000000000000000000..367d0626765f216f1da6d7ead5c0ae3ecb16931e GIT binary patch literal 1238 zcmah|%Wl&^6g`tTF?LOwmZm%!N?Y2J2h>)?FqB*Ek&au?ROklQU@*L}eAjfNFOeBUjxcHG`kp!FGutvRxHoY`V7}%d zf8$MUPmH(|iFZkw=w^c0k6OcwBZW_Vm)l;9ixIu#*qVWL)Co70xWiWaW}uEu+)=S* zpdp*X~%YB+u!V7!GFvzVb z(%;x=k3pNz&|>o$4sx;;ZApOmEUYNBeUD*_Mzeg4sHD*k zbiRXqqmL5yXqA5hHSE)BBn3FYW7;wKT4umF_jv94y}&&r1zwKN~4P_$RAt_CI?Yj#^ zT0*4IFo_8DGZOP86_cAX$NgnB|1pKYYiOn5=cHZsuXVb=@L-N+uBPZ}s)7LRxakhM HaeVq0YT*vS literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java b/lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java deleted file mode 100644 index 4c27b43..0000000 --- a/lib/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.muyu.rule.common.basic.abstracts; - -import com.muyu.common.domain.DataValue; -import com.muyu.rule.common.basic.BasicEngine; -import com.muyu.rule.common.basic.handler.DataEngineValueHandler; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.abstracts - * @Project：cloud-etl-rule - * @name：DataEngineValueAu - * @Date：2024/8/29 15:11 - */ -public abstract class DataEngineValueActuator implements BasicEngine { - -public void set(DataValue dataValue){ - DataEngineValueHandler.set(dataValue); -} - -public DataValue get(){ - return DataEngineValueHandler.get(); -} - - @Override - public void execution() { - - this.run(); - this.remove(); - -} - public abstract void run(); - -} diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.class new file mode 100644 index 0000000000000000000000000000000000000000..7337d3b5fc3a392e11862437c0fbe896da2fedff GIT binary patch literal 750 zcmb7CJx>Bb5Pi#sCwK@V_>IKG=wabDc8HB=EQl5u8mhfx1555BIqppSS6WFdjI}?? zI0pm-8@yunX7;^#Z?g0C{r&-x(DBZQ*wLgV~o>z_41p^G{k-An9_d~rcIT6!?T3l626M^Nih-h)PSKjv-W?@D#NL<%yg9& zgWe&(bvdwnWs<2Aqp}Q>A>H&s-;%c~8l^OQr}^>EqesFKHfd9$FAf&%3dJI2oK8k( z^6U-lm40H_q8MER8EjM3#{leLm$DRX&K_0f$wO$1K literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java b/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java deleted file mode 100644 index 5014718..0000000 --- a/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.muyu.rule.common.basic.handler; - -import com.muyu.common.domain.DataValue; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.handler - * @Project：cloud-etl-rule - * @name：DataEngineValueHandler - * @Date：2024/8/29 14:35 - * @Description:数据集作用域 - */ -public class DataEngineDataSetHandler { - - public static void set(DataValue[][] dataDescribe){DataEngineHandler.set(dataDescribe);} - - public static DataValue[][] get(){ - return DataEngineHandler.get(); - } - -} diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.class new file mode 100644 index 0000000000000000000000000000000000000000..7ef02a5da909230fe1f799084e8ef91f613aca6b GIT binary patch literal 897 zcmbVK%TC)s6g`uKI592+N}wgQw51P+N}Ua2LDFpcP#00Vz>3u6#2F<hiF2g z^&yr2H4Vl(cGTD>WOGs7NW~t%bFh}oyt%;f@PFD$(Tu$3Y+v*#Pe-8BcTSe^f!%c+ z5;yv;pHJF6jndfFpFPfWduf30*c;Dj6)Lnu0=v8nba&`g!5(dr;BBJw2_cehLHEkx zHN@qD@{~^g22AYJ$zmel8JPl2o-`pWJ|;u{Yy5<9c!dXro);Hr!60_w(ZCBFEIer1 z#9)v8g#%!a#}yu45F}8f(9ZLINr7qhdEkS;L^~We6J>EbMBJkWyebJeA7J$l*1lh3 S_ZN&ploiWmz9vcqZ|(teRJcU| literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.java b/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.java deleted file mode 100644 index df49518..0000000 --- a/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.rule.common.basic.handler; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic - * @Project：cloud-etl-rule - * @name：规则引擎作用域 - * @Date：2024/8/29 14:21 - */ -public class DataEngineHandler { - - private static final ThreadLocal dataEngineHandler = new ThreadLocal<>(); - - public static void set(final Object handler){ - - dataEngineHandler.set(handler); - } - - public static T get(){ - - return (T) dataEngineHandler.get(); - - } - - -public static void remove(){ - dataEngineHandler.remove(); -} - - - - - - - -} diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.class new file mode 100644 index 0000000000000000000000000000000000000000..275fb7c69cb33c8de8771324c8ad33c584ac7692 GIT binary patch literal 735 zcmb7CxlY4C5Ph4=#F!+61PG@P0yz|HgM?6khC>tZty?t-I^YQum2H*gzI#Nh$$QZ~X$585sJHcJyxA}$Lkxq{xx37HF zJ7h?k^`?#q&3UFGmw;kR5F@?+5xCw^P`@~mH> zo4S%NuA0_wwMJi|V4#Q+;o32-V%GlxHIy0FZ>*t#fp#nKgz^*7rf?(K&`@F69m2-( zc^TXft!9pbmSiYeM z2BSqk_E>hEP}$^X!>o@%WYDjID0Jkhikqm79%t0_cKj+>!wii^{H4L-;h|n`QI@AsS@=VKf%cnR_(5JoIUyIZG$5}g5`gxCsdr32 Q(lPs{Jx$p%)lyjb0&69)MF0Q* literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java b/lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java deleted file mode 100644 index 4091e2b..0000000 --- a/lib/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.rule.common.basic.handler; - -import com.muyu.common.domain.DataValue; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.handler - * @Project：cloud-etl-rule - * @name：数据记录/行作用域 - * @Date：2024/8/29 14:35 - */ -public class DataEngineRowHandler { - - public static void set(DataValue[] dataDescribe){DataEngineHandler.set(dataDescribe);} - - public static DataValue[] get(){ - return DataEngineHandler.get(); - } - -} diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.class new file mode 100644 index 0000000000000000000000000000000000000000..48f0ef778478ba62596e6c7e7d44c98622a201b3 GIT binary patch literal 1117 zcmb7DO>fgc5Ph3CabjHBhNOk2v`OekQlJZh3k0|n5J(XmK)G+6RqDzgl4D2kuiyd^ z2gI2lg_yOC;|40g2YYAy=DnS_v)_Mw`3m4M?iwhds6#VRLYZOhOw0s#gg4=@M`zLs z8Oo1r&kmn36uZ5lfeNZR3=@}NGTgU(m%GvXhzF4)IYqAT@sXI?7C#l<*pUH$Dnjwh zo7kRwkz|NzDv7w!9W1N$6NSqrRD#Vt9~I{7VNhY1YObZ7eIlU)1ANUG-C;e$styV%tCq zZ5`i4-z=xUL25MJDY!*{)uYXEMTsTIL~IL1Gzm?En4)vk8=ufzrrsg&Z5(IR Vi8qxwcGw)d%jgc_I7t?8=O@S1{kZ@D literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java b/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java deleted file mode 100644 index c84b9cd..0000000 --- a/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.rule.common.basic.handler; - -import com.muyu.common.core.text.Convert; -import com.muyu.common.domain.DataValue; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.handler - * @Project：cloud-etl-rule - * @name：数据值作用域 - * @Date：2024/8/29 14:35 - */ -public class DataEngineValueHandler { - - - public static void set(DataValue dataValue){ - - DataEngineHandler.set(dataValue); - - } - public static DataValue get(){ - return DataEngineHandler.get(); - } - - public static void remove(){ - DataEngineHandler.remove(); - } - - public static Object getValue(){ - return get().getValue(); - } - - public static Integer getInt(){ - return Convert.toInt(getValue(),null); - } - -} diff --git a/lib/com/muyu/rule/common/domain/RuleEngine.class b/lib/com/muyu/rule/common/domain/RuleEngine.class new file mode 100644 index 0000000000000000000000000000000000000000..b6bb9e21b0c17a0c532b2f1223b895c5d502d8bb GIT binary patch literal 7651 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 longSupplier){ - - return RuleEngine.builder().id(longSupplier.get()) - .open(etlRule.getOpen()) - .name(etlRule.getName()) - .regionName(etlRule.getRegionName()) - .status(etlRule.getStatus()) - .code(etlRule.getCode()) - .remark(etlRule.getRemark()) - .ruleDesc(etlRule.getRuleDesc()) - .build(); - - } - - public static RuleEngine addBuild(EtlRuleAddReq etlRule){ - - return RuleEngine.builder() - .open(etlRule.getOpen()) - .name(etlRule.getName()) - .regionName(etlRule.getRegionName()) - .status(etlRule.getStatus()) - .code(etlRule.getCode()) - .ruleDesc(etlRule.getRuleDesc()) - .remark(etlRule.getRemark()) - .build(); - - } -} diff --git a/lib/com/muyu/rule/common/domain/RuleEngineVersion.class b/lib/com/muyu/rule/common/domain/RuleEngineVersion.class new file mode 100644 index 0000000000000000000000000000000000000000..f65b76be8e3be31b586905410dff6b15e8d23f31 GIT binary patch literal 8019 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 ZT~62)DpEYm^Y0qo=SgkQ5>~K^{D1lC4H5tV literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/domain/RuleRegion.java b/lib/com/muyu/rule/common/domain/RuleRegion.java deleted file mode 100644 index 0ea7d86..0000000 --- a/lib/com/muyu/rule/common/domain/RuleRegion.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.rule.common.domain; - -import com.muyu.common.core.web.domain.BaseEntity; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.common.domain.resp - * @Project：cloud-etl-rule - * @name：RuleRegion - * @Date：2024/8/23 9:03 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Tag(name = "规则作用域") -public class RuleRegion extends BaseEntity { - - private Long regionId; - - private String regionName; - - -} diff --git a/lib/com/muyu/rule/common/domain/req/EtlRuleAddReq.class b/lib/com/muyu/rule/common/domain/req/EtlRuleAddReq.class new file mode 100644 index 0000000000000000000000000000000000000000..ecfd09dee68f36760034530b237ef1bc0b2b7409 GIT binary patch literal 5711 zcmc&&TXP&&5&lNn*_mC9R`T5wJF#W2iL6T&2pBw)>{zxGE0*j;GB!!LWVD*B*4mws zcV`{UEhG+L!X+0jxsalO2V4a%jH$>f5-LSrLKV+E!4nTQ{s+8Z!q+pi+Lb(U$zX~q z&73~nU-z8Tr@K#U|Mai7-T^R#H_~W9tA>OD6-fo1r|dI!u4KD~+_C9XPTp6L94xv; zf1iTZ?%gL+(2>%RHqZt`!EoLy=gPISwOplEa&nxNJvTSwmF=RNt2n1~BYtU;k^?g{ zlg{bvve|I0SekJv3KFheb`-1~Z+v^ouN2+FKnfZ8T8D!E+xn2Ka*cttvcyE*n{mX@ z8sTm*urc6z^NuUr4Z<}I+$G#}#VHg$_bAsRGE-!C8@NYg$*OPrwW{#%7Jiq39m3aT z=ZBnXUL;*2*=68EfkwqC+m$)t@6xba!RT#mBGy}D<@r(?-DpkIYM+6A+{Y#4ZFl5! z%`Pd}(B0(4@B{~TKPKQ08~6x5sz56^zHCsz`tIFL;K=0?4<9q|aj~0p#AsEtKVjgL zb?t+6sPHTU19jdpx>I;V2KEWBonM(;a;8WgFmOO5DN3dSR|@x_fkVP=6MW=I;g1@4 zu#TP#+$akhGw=|OaKp29byk)U1m)OThVq1gqd2BuQ`w$#4tj3h_D>dlf?S@P>sJ-L z-0YfYw>R(qf5(Y&wt@${$N&4F7}$M+aUS}kW4!1(M{DJ2r*hn$E(LkzS z#7y|JMfxOndtV<=piC<`bbDH{flN~y$CoYa?0kK3hwp&>!JeLd{6=c3Sa6xQ6*}U` zo$z&FSNyF_*X!3P^XLv7qJoF+h@oibTD6|%%W6Ut_`wc{2!lqjlEKVdQjNT&|2Pk` zl{qT1C`Us{n3)U;Z+ZES3XcNS^Jk^RrzG66VVzG0yl4^%@h z-^Gg&pPuq+mAo@r464eqyZk=6x)qp{HPv}u_-l#l;?(w3Rt3G8H z3Qi?==Kh>#S95j)kn` z?eeo%Fa7TN<)1Mak2+Oh(@jbkt;YGO_UQ&>4 zv=>G9j5p`xLg$8;#i*V4y~}~!aLb!wnc{Jlwix*1 zO&01`brUNxanLT6ri#8ZpyT@rrk1(ATQX`$>Dw+*CZj}|jEyLhSr}yjKZ@}XBT+V_ zurV>lT-T`_EZNnnLvOBM_K~GNZF3x38WIh!D%f?Cd*i&O;dKS~+#1R}3SEpYb^-0Z<1<}rY;!S#swoAw_s$G7L07lf{`s4$Bjs^v3;0&k8pO5qu3kjS%lKl`zEvn zw9DAJfORsiU%)0AH!om|j9VA5O~&mD*ePRn0ry^}fmTfNorJ>oT1@f1F*JdPm$`x7r2L$ z*sSUQL`FmA1~&5I;-9YEAU7aW|0&6B@qhg=s<4-%R1;OgNj&#K!C5c-gwkK)IsTV{ zBcYj=-%>A4?RPr|1`|U;2yX2hm}LO!oxK;J^%PvC2$ zG`zs;;2Baneu+(ZmQ+fPT`3^*J{bufyP`gC7XB+ zmZ#(|aBby!`bSW|ncIpQy%g5l8 zQAa@AK_4tNpih3#WT*)x_i7@bxene+O{=-Cyhzx#2&MSBgKZf~l#0Zy< literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/domain/req/EtlRuleAddReq.java b/lib/com/muyu/rule/common/domain/req/EtlRuleAddReq.java deleted file mode 100644 index 0ff7d41..0000000 --- a/lib/com/muyu/rule/common/domain/req/EtlRuleAddReq.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.muyu.rule.common.domain.req; - -import com.muyu.rule.common.utils.OssUtil; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @Author：张承志 - * @Package：com.muyu.etl.common.domain.req - * @Project：cloud-etl - * @name：EtlRuleAddReq - * @Date：2024/8/21 23:49 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@Tag(name = "客户端规则添加请求对象") -public class EtlRuleAddReq { - - /** 规则名称 */ - private String name ; - - /** 引擎编码 */ - private String code; - - /** 是否公开 0已激活 1未激活 */ - private String open; - - /** 规则作用域 */ - private String regionName; - - /** 状态 0正常 1停用 */ - private String status ; - - /** 规则引擎描述 */ - private String ruleDesc; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/lib/com/muyu/rule/common/domain/req/EtlRuleListReq.class b/lib/com/muyu/rule/common/domain/req/EtlRuleListReq.class new file mode 100644 index 0000000000000000000000000000000000000000..7e4fb936977b0b147c3027bed11d0c394d5e7168 GIT binary patch literal 4739 zcmcIoU2_{(8Geqe)k^Z(aqK#d;xu)LTKui14Fn`RkT?l(v7KTEm$VeRmKS?tY1h%N zQUZn25;_@rQ?3f!l?%cQfsmn2hQcs~i!#F>=nsID{0K^U-rbcgIZH_xGqKKj&--=G zc|XtQum5`Ij{qj|S{4bk=|~#TkW%QnU|uo{71LQMoL#zLm3@WOgzeb=F@?6lp~Vc+ z$mqx#XosP2vg}q1)%xXnp;oV01+J>DQ&@JZrtK7J*2TgpzcNqCjP3dJ*2R45@opi}nSr7-?rTggFp8|ao(CLObCiKg9x?KQ9`z`E;} zBiLTS<_zo;Y|8UZzwQY>C-{dA91wh3E_l-N%0hWq$3cZN4|byX%THI=D_IPnEla(5 z1CQb{ZdNv(Qy1%IMWJ`F$ta;qN<+^I^Pqtt3@hj>mOmBP@1en=Cg#Y3;^0vOW1=@@ ziBeCb3kDud=G#=vI<+fJ+RY`l{xdHRU>G(|^YH$>h-Dj_)Zr%~y?1fA4+%H%yFS z6s8AfcEW|Fp+&}6c-vhwwqwoJt4mhxoVip9g4!*cl|{2=%Q`|P{Z*Sce*6LVFDa-c zh0_lx79V+3wr8g0Y?s#?=X+{Lc9<9*KE_=#3-*e`q^i*xvpZw*K(m-#Uux8lGYtM6 z@utGe4ylUnuX~LIZAs=R!h>6oLz0m9Atb3ss}Twlj%h}?k!B15x3yG8RY5^>{Z%Qa z8HuiZSW~kBE?R^HsfG#>AzXw6DTtedaM2#9VurFNDj1=%#cbnpV@ zwOMmL3VZG8`RUnHyumbUQO)w|74{b`I-Hgd&!XkSt@V6kpG&W#Gvwf%U;pfbtGEC0%NuvEUAc4hCwH#CdH1bf+`V!8gPX73 zx$(QZH{W6m%vqj4Ye{9H@~#uE>wA99T%Wc4Rd?CjmBNczd=r;-d`l|rw-xeR-PCq2 zxocJ-v|LzxPn%`mtzB05akCjC#!%@Q(^;-qUVg@P*Xrw~kFC5dg6CLCV%VQ+($HvS zO{hr4lv$}P*uGUt<2woyt#%)jsGd}#0}?ATORUHo#)?3VSeaBqjM!<%v1(Hl)AKBv zt+!R%<^v=bi)d?>{TKeAo;u~^|RVLlQr(n8|z)bI!$EskuqSXUq& zIx@BC$W#znV(5itOS^W^y6=w+{~TKK`pBQq`BP|Z*GJw(=j`b4EgTA#1U@-8%AuGX`wQB0 z$@j4P8jP`A@)kxK9OFfeEaSygP7|Kgd+5G~j+~ZDH8CA7>SQ`xOy_iAN=Hn3F5Sd* zq?jSokzzKN5vFX!l*whAn2r|P$#k@6 zXpmm~8RuCQ63FAXc$T;}M)R-m9HAufZ{VwhG**Nk;(0s_UZ}Efil6{CF`bgj_PBq$M0e(&3^OkQfPpP&%hINJomPfRx%KF+M`6qeVR+F*G76 zJs|CmcjSC{%*c^#xJoB{gO||o8deA;X!=*M$_uvP5NDfE636Jk3xwqAPtbwlNFRN4 zrZ`gE@;78ZA|gq*C`DI5sgI~)Yn>28FSG_jgNH4v85Oamns8g3+p!U|-pahiA47;l z()WmLNyXDBNHbM8YxPMQL;BM`ake;?zr*|;;qT}>v>3J*@Gz64oKPxqfEZr7U~9)? z!`@!!x?`)q1}74Ji6&1`@j%$^rPYs0pC6MZpG!)M&uLMEZw~REK<}|ob~C*PqP{?V z!J9++%7FZ@2wf_WRM%txNqyA#&*dtCbzJ1!4#ni=H;Bhah)+a{qyYwAop73jOZ>fr b?{c+|3e$Y(yqwICqZ8jF<`sM&KS1u^?+@?Q literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/domain/req/EtlRuleListReq.java b/lib/com/muyu/rule/common/domain/req/EtlRuleListReq.java deleted file mode 100644 index 160a9d2..0000000 --- a/lib/com/muyu/rule/common/domain/req/EtlRuleListReq.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.muyu.rule.common.domain.req; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @Author：张承志 - * @Package：com.muyu.etl.common.domain.req - * @Project：cloud-etl - * @name：EtlRuleListReq - * @Date：2024/8/21 21:42 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@Tag(name = "客户端规则列表请求对象") -public class EtlRuleListReq { - - /** 引擎编码 */ - private String code; - - /** 数据来源名称 */ - private String name ; - - /** 是否激活公开 Y已激活 N未激活 */ - private String open ; - - - - /** 状态 0正常 1停用 */ - private String status ; - - /** 规则引擎描述 */ - private String ruleDesc; - - - -} diff --git a/lib/com/muyu/rule/common/domain/req/EtlRuleUpdReq.class b/lib/com/muyu/rule/common/domain/req/EtlRuleUpdReq.class new file mode 100644 index 0000000000000000000000000000000000000000..bd534fd14a3569214b3ceceab250c08407bf60ad GIT binary patch literal 5711 zcmc&&TXP&&5&lNn*_mC9Rx95pc4Et36J4`Fz~Gf+C$gnjv1BKbBa?(nMyttct=$=U zch>_dAFP`*G|{6m0HQpa#nVo?3`P+icYp-pUjSWr721tS)7}) zPi9ukMry^YZ|yixXFrLD7wxOu1931$nG?7m&oE(&+=+j;om9zE(1G-uglI4 z+SR;BxLv7s9-~PPZKzFxx~ZA418Sd#%(cL741(L_+(xC z039m4oPohQ?3g9?;c1qW|UD>9I2YSYAug`HlkFYeH7us_t>yN};UOcx6d^R_}q9KIdC z_U($lwb^?88e<;ahC@{F;B7G!?p&+Z^L#~32m{~W0TDsa2v#zfc}uF1xAY(9LAEkS zMHc30APF*)LE)|}-(lfVpt|0?l=y^%TPCRUNuL)^0zuwSO>wfP`sJ}b5YBLLK=?SX~mouoqjWk#SKRPSZ&`m~+y$S+J0^#8kf zG2)ZcZmp8H$BKScS#g)&BUiTqbE@We#j-t9tQJ{o?spuQN5C7EhtNGybhFi`tU|%A zWKZ3jb**aFY5=mHRj6iWwR6v2Is5A0e)q=Jm)^Q|;qujs z&s@3i*0qa2WiTGGtKOt7b&kfQ{9WD>QMyDwU>-o;|4J2MVTFxV>94YFO#tAyFoyM460@D3e(bWj;TQ@c<)HHmtBQ zF~%Lot{f;?)v8TzZdmb=?Wyr$tb1$W&X$~+2Oj4pNpExg<{ zzS(b*YLTYSAKAwFBO5n=WRvEPY|8wREf~j5h_SJKhPEw`gTK z$_mupH_zpUWXYPc*#nz#t%^{bV)MJlt~i%{OYT6ue##`JP|7Acs3Gw@!md$oP<#GS*3mL zAcW$}Ar$vxUXIv`wzGb%b|h!S&TO=u&1*qMvAvwf|0B95Iavs+woI=E$1aQN9^#wC%zx%As^y7cQTi|`g(s3HFm!5U8G)v+Iqh4 z_ef3l_g+GuKP8bp($7~eHt+|unX&iKc@D;a8M}mg>xex$m5@ETxTy*z{vOtyL%XS( z@g~sToJP>zoNj6Y(nFAD>P?`bT!NsXT+&PkC>eqhX0i#iKi5Xk{+wa93CIXRq?$k@ zxpsm^aw)T2K&cSaZl;<*qqz=(MssPiLqO>e)M2LUpxAk)L~~UQQsR8zyn0F~T_|9l zuHC2@D6-PFAcN~TL0&6*@eeGJit#_kKchrS#U%cOGO0M{OK?bOsNe!zQaWD1^H?O6 zz{~hHPLfLE5^YpSwc)o6t12l2f58|$QtkLF?n8}KiexG|C`b#{=|1xkm zFw^pD>LscDZhCMiHtdJsw)EgU15i)*or5-T35T8#{+?V+1ZFIh=n|HJXm3vSMT|&a zNjKHHXebx=Me$`3<22CPpVNF1Lp0RV>Y|aH?u+zg5d$~S8qFnq5o0#gO8BB}(ZTa% zu(>dJTJa7};|tun%A@@vDcSsGe2H#p#V-5=UnUjf&lhL#6;diM>v?>YPn?H8iLa5; z@Eos$r%CDf1vcXuQVBVBrGV7?WW;#viX!cbqP$PDjd_bOHbSif>KL{s&8!d>Z{jtO ztGOXqTM2I9BLty}euGLwD_RyR^4GXvgTy!g`TLE@k9E=FP(Aqp^2XP1hM*B1-0#q5{sqeF%{UUmp}A} z9RY3oeX!Jke)&O@p(d2vt1+LFn^E;Cx!dACCAX7C?$m+>lo4D;U@vzlN4 literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/domain/req/EtlRuleUpdReq.java b/lib/com/muyu/rule/common/domain/req/EtlRuleUpdReq.java deleted file mode 100644 index 5310bd5..0000000 --- a/lib/com/muyu/rule/common/domain/req/EtlRuleUpdReq.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.muyu.rule.common.domain.req; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @Author：张承志 - * @Package：com.muyu.etl.common.domain.req - * @Project：cloud-etl - * @name：EtlRuleUpdReq - * @Date：2024/8/21 23:48 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@Tag(name = "客户端规则修改请求对象") -public class EtlRuleUpdReq { - - - /** 规则名称 */ - private String name ; - - /** 引擎编码 */ - private String code; - - /** 是否公开 0已激活 1未激活 */ - private String open ; - - /** 规则作用域 */ - private String regionName; - - /** 状态 0正常 1停用 */ - private String status ; - - - /** 规则引擎描述 */ - private String ruleDesc; - -/** - * 备注 - */ - -private String remark; - - -} diff --git a/lib/com/muyu/rule/common/domain/req/VersionAddReq.class b/lib/com/muyu/rule/common/domain/req/VersionAddReq.class new file mode 100644 index 0000000000000000000000000000000000000000..65e96fe212dfa1d2660f690b9422116c207cfe95 GIT binary patch literal 6859 zcmdT}S#TUj8UA~36Pk>U<{F6If{Y@LKROuC8PfB(Ju-M?S{B@ykWUqr}9EgJcC3Q$l`{D^hTN@cD5eCp8b5j$NL z6x@}`XUc%a;=q^E_w3Xj?v|?oib@#Y7LHWTz z?|rPiQ>S;4DJV8?mz~{I+t$_7>#}h+j-6|l4mSgQ&}QrsgS=a(_b`YK5KLNa3k&w> zw6_VJH-$y}blT6NFl?semN55#PNU4#z&(TwVcy+3jW>btcChH6PKT->({eMI`(B-< znA=vLliUiH9oFf6Rf{RP5j>}Rbb3GCizQpIN(=mjGB`#%5K{N+^a1*ypw&5R(cW9g zr>*imnKG2}*!_IDB9aGxJ!fDVsDTASXt6B03an z83S3UZl^pd42H@Mm^5h42@PtT39!--srX0KyD&HbE2)ZgxKN?-L~@d$pg^I#z=v0y zoiovJg0)LgBQGY^($!>#VU?1L(}1L=(}<*aQHi8ZB`k=7sdmFs$VZc)h!Uwz1Grj* zMsUSb;K)=sr)uEUZo7M`GDBi*8s_RSollhMvWB9LF+r_Z`1In0wd6#1U~+17Vjos| zln-0GRLP>|&>L4Tl5nk4O{UgEOH?NxNT|8i6x5uwM0EnKRaECYVd{Kis9aE9Cg}P9 zhxCk4h)fqM#k9RYBlD(n7OOhzcCMfV8B>*fIg_(zGNlZ%=}JC2O~mb=PtnPR_n zDX`yiSNW|=ApMs6%5QgzUWCeMK5rKxDV1!jdsoBf)N1TCUTiJ{H999~>optUwZ0mi z7qsEVs)%8=8MGPIlMe+^7;oGaK>4^5mo3U}*`mUhEh=i+qK1|&%4ON2JeDmAVYF+> zk4wsjfb(JWzKWLdCz2OQB>P?@ZJAoRjW1Itw_VG$n%gzYw2s^L%e0Z(P0O@}+r%<$ z%MijT4^6sLVZ#*EJjWcp9UC_b}erY`opm7?r+<@s?)e9iGOx z3wRiBYc{^i(->C<597XO<6WM{xKnr-r<#rTcpB#@?--l#3XXwbvJcMB&g=G)c4@7g zH&}Dtpo~U#u7WpC=Sp!nni*%w8)x-OaX1?=&QWiibt}c;Y{EE2Z=8)Q#o=tkI3;hK zEi1+0Y{occZ=7u_#o=toI2CW4zLnx|Hf5Y+-Z(P(t;Byg8#4~B^>`y$`F;<->qb^v z>`T5t0sq;)UsLQU3bdT<`xV6|wkI#pow5t!od>t$W%~PnOHsrB8nvGxz2ER(pnM=5MX zTuLKm6iOqeZbVs0ca%W6l*Y_fD2JVcn98Q7i6qB@$J_o9cK99NPXoD8|7sWJ+y+Nxq z^5HKe-k>##4BuK3i-O<8ly~D$7Bb5Q*sXcpuNNfMqZp?)R-4yd@b5$lrsXv3xQzKn zd|;PSj4=K^L#C+01p6wMON-zK6gu30-4SxAK-bhWPnhO%VF- zKRI7N|GMricFZH!k=IARk%j{jy*@}C=S`FxDE)>|b+k9v10dY($yz;j7|z0Vcaj5? zgAvaVo?$#Ac*gKd;F-iT{W9H0)LgWwOw30lP-?|F{<{KBV`YzvOY_;?=~?jw=qbne zRT&XPJJqd+uROT7bSC@xvSax9s$&HBqGJU4nqz2u$uUBF#WBLp1;?Gfy5x8dA})Yg zJvKn`jg2R;Q{LIQ#@xyOEJ0{6#g&#{Qd}zqB*oQEP*Pm4Xp-WJBP1!V8N$%~7J5E< zn!b%TiV>c{^PLhsOV5E3glGp0z6&}8!T0d|kbaEbS_~Y*h4QRF42>B51e~8@<$q4b Fe*paNj`aWl literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/domain/req/VersionAddReq.java b/lib/com/muyu/rule/common/domain/req/VersionAddReq.java deleted file mode 100644 index 0f6af56..0000000 --- a/lib/com/muyu/rule/common/domain/req/VersionAddReq.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.muyu.rule.common.domain.req; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.common.domain.req - * @Project：cloud-etl-rule - * @name：VersionAddReq - * @Date：2024/8/26 9:47 - */ - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@Tag(name = "规则版本添加请求对象") -public class VersionAddReq { - - /** - * 版本名称 - */ - private String versionName; - - /** - * 版本类名 - */ - private String className; - /** - * 版本编码 - */ - private String versionCode; - /** - * 规则引擎外键 - */ - private String ruleId; - /** - * 是否开启规则引擎 - */ - private String open; - /** - * 版本描述 - */ - private String versionDesc; - - /** - * 状态 0正常 1.停用 - */ - - private String status; - - /** - * 引擎类代码 - */ - - private String versionClazz; - - - /** - * 备注 - */ - private String remark; - - -} diff --git a/lib/com/muyu/rule/common/domain/resp/EtlRuleResp.class b/lib/com/muyu/rule/common/domain/resp/EtlRuleResp.class new file mode 100644 index 0000000000000000000000000000000000000000..1eeb222af2a15c026e6ca771b1f94c444ba2c1a1 GIT binary patch literal 8592 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 A^Z)<= literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/domain/resp/EtlRuleResp.java b/lib/com/muyu/rule/common/domain/resp/EtlRuleResp.java deleted file mode 100644 index 422c175..0000000 --- a/lib/com/muyu/rule/common/domain/resp/EtlRuleResp.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.muyu.rule.common.domain.resp; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.rule.common.domain.RuleEngine; -import com.muyu.rule.common.domain.RuleEngineVersion; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -import java.util.List; - -/** - * @Author：张承志 - * @Package：com.muyu.etl.common.domain.resp - * @Project：cloud-etl - * @name：EtlRuleResp - * @Date：2024/8/21 21:57 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Tag(name = "规则信息相应对象", description = "负责规则信息查询的响应结果") -public class EtlRuleResp { - - - /** - *主键 - */ - @TableId(value = "id" , type = IdType.AUTO) - private Long id ; - - /** 规则名称 */ - private String name ; - - /** 引擎编码 */ - private String code; - - - /** 规则作用域 */ - private String regionName; - - /** 状态 0正常 1停用 */ - private String status ; - - /** 是否激活 */ - private String open ; - - /** 规则引擎描述 */ - private String ruleDesc; - - - @Schema(description = "创建人", defaultValue = "muyu", type = "String") - private String createBy; - - - - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "创建时间", defaultValue = "2024-8-1 0:22:36", type = "Date") - private Date createTime; - - - List versionList; - - -public static EtlRuleResp etlRuleRespBuilder(RuleEngine etlRule){ - - return EtlRuleResp.builder() - .id(etlRule.getId()) - .code(etlRule.getCode()) - .name(etlRule.getName()) - .status(etlRule.getStatus()) - .open(etlRule.getOpen()) - .regionName(etlRule.getRegionName()) - .ruleDesc(etlRule.getRuleDesc()) - .createBy(etlRule.getCreateBy()) - .createTime(etlRule.getCreateTime()).build(); - - - -} - -} diff --git a/lib/com/muyu/rule/common/engine/ENGINE_DataSet_asdf_S1.class b/lib/com/muyu/rule/common/engine/ENGINE_DataSet_asdf_S1.class new file mode 100644 index 0000000000000000000000000000000000000000..3cac4b5bf48d0837de9446ed3e5b1eb5dc15f688 GIT binary patch literal 964 zcma)4&rcIk5dK~ZY`ZLig%+g#LJ``6tRS~4iIHkdDw@3J>6mhf zA)d=uRV0v9plaxc#;~w2xQKxC(#qv4E2UZou*Uty?OJ7?aGF9gOy%;ctL5GL4zGr5 zbJL0FRJj$1Vgd&kpkfFI6{Iu_V}xO7jo;_G#hs>Jk)G)^iKVy~aLZ>%=gNE8YxOl@ z$YTCh0vU!LC$KC9V+?bYruF(!>%)`Q^H)2cAMb2$t2l{C1*bGj zVVYq$qTgN4psa^rmh;zu?eUBGDouCMZ3u?JG97UxuvF5FBPOxIoZ*K}2St}u^j>;t%u=Ng8P;z;Yr zAj_~|`yI0r@5N>iyV9gx$M;N2gpO?rD~tkRN1?eWBC+IcI-XR2Z5chVqgX_Kz>vM? zcuusykSdkeG~|%y&~y}_GtBn|mkE%$)Oz%!wY1&?T;Gd=AX;x%320MB3^S$j%a_e# zfF7|8zatzk;j<>(ST>Z$4|I&+9D`1V3NFzwTqu>B+hSLkuJAU^b`&_?W}|>noaeZp zqlk|f#*_o$I+n16`K<_}?a=qC=F|3Si=nV1f>5qn+tMaNwbHw2<%D2=`$M}%4wopT zS8`9o7%p>MQMnmsm>lf+$m2|3k0&AZJaAlPICmmGj8wxlOmSS-F|BfwxJ&9hAd^%{ zO5ZcZa{@CuZlXjY`CTmBkfC^*O3!ckh4N9+F^gLaIkN7X_}*y^w_$R8tm6)-$kVoG zZpD%ByVP@mG~>u|%|#hXFLWa32f6VL38(}e-*Q~}e9QNw>WO|O_BKsi8`)&}iN`ZD@vD!+sMnyBy5s??yX;XbYU;Q=h*3)(S!d1TB&0vjgT zPn9lsla}F?TW|4UYi{&n7sj8MsHbP^86&e_%cg3)$cx!GSTQn1UajYhTs?2(_iI|J zRwx#V+8fLn`C_43*A2akNh96Gjh}JeNVa9ddW*R(=3f`sF9(0W=CuA+neF0J#W@AV zxk^ldixivz4VUQ-9H%ShD&{eX6-vMhOktb;cSyF28T^P+65nHR(vRZ-z9NKql0C#C zrHkU~#hk(SSi&;Jt|7o9Jf^ru(7_WtCEsJPaEWATJR_TRWDalxIj-I&#{|b%vNjo| e^nkeO{ZvGOUUj5$KoJZu|A$lzEpju2)&Brx5wG$9 literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/engine/ENGINE_ROW_HANG_R1.class b/lib/com/muyu/rule/common/engine/ENGINE_ROW_HANG_R1.class new file mode 100644 index 0000000000000000000000000000000000000000..e172d6fba9fbf8d8d01cf4908872886aea0dbcf6 GIT binary patch literal 1366 zcma)+TTc@~6vzM578csYa*<0#fr3C=E(?M;3TTB2m|6%mHHHT=Et|4ryNi3#^keA* zc!|bmAN)whGrNUCD8XzpyL0B8|M|^1GyD7Rx1Ru3kPRb%poEZ&7PK-fmCdSBb!)C- zxw@**tZEuciQ8IP;U(L#c-gU)b?)%2QPB)_*Zi0%J1%!ji=lN{Gc;$FA(%)O!)Qah zgs_YVWQN(M!m1~tWb+$a`RxAg_S^l3jzNbcp%L+dyPW|eD(M^WUu ztESs=3sDK3GP=;s(0Rl^a7E`vMJd#5N3D{Y>5^J+&Rfw;WyjJCr{GvBucpJeja~_T zGWs!a7VSEku4F8W*KCG1$0T3Ps4z?>_Iwdfe!Fy}mYsC+g2{Iz(K{HFa974X3^DXH zNz5P}3k=;Lvcy%1WKqHhLzfro@oaMYu%J2ucvQw1?o-XVozrZuQrCld!NQHOhA|;} zJ;@NO=k!+BOkJm~Xr_@Cd6NtyH=BD;q6-c@&0^H?N|`Yrd$PZgt>i0@D@ zTci<7W$C+&S35pKT(~T=+(5nVx~x*FaKUt~viedJB>h(};H>B-;#B7V{U|^q6MqOA zAJI&qH=}n;>J;pgxBQq!u?)I{PiT~V2Ry|R%^1?>!G91WDd1J=1XAuZI;Os$=LE6u z7=A~e@l%Yyo(}#%;ww@C{K8zGd}e%~)XWJUh`6N?8Dk;eDhPrQ1QTedae(w=h+>eQ zAtdR{FJOeI;#kEfw#Z8mF8UO8!WLw)jCmp*r0uPcXMiH(ct*A$&15{MuMjd6DfZ@j Nz3>XNMz#Rf{{a>)S>*r# literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V1.class b/lib/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V1.class new file mode 100644 index 0000000000000000000000000000000000000000..33b129f027d6ccee59a18836eb48123bf4572649 GIT binary patch literal 1425 zcmah}OHUL*5dNA4W*G<3MZgC>P(;ATfNx!V-~wv0qRHwSN*qel~ehtHFLz!+;D!V*z0-BUePUwu{eb$|Fd_ZGkr_rJ>$H z0~#5IELkxt!E|7Hfg?<^D$+Ge+_x>0mwe@MOZnyqSA5i+uw7B)P9TOY6>udzhQ=Y= zwbfCERBvBVM;c8UbOXy^Fzi_pT0}7B==jOgF@ zefjzDgj88pxa~$D zhE)u^=5cCUBCcDas%&b`h;VErMt|FBv@>*mzWe<1oo63k&3$<~_x;W7Zx3#KeRA{T ztH+<--0ITNiq&Di*D$p8)?_Ux&vqxWeZ?lML#KxI1~yI8m4z#hWeZ=3x<|FX=6O7l!SMlmmE6Db7ky&wb65@UAAv-2-X+!Yp1 zqc|a@3a>%+j8K!Z?6)*xzm5YqsNqo9^TQ<8g>l*LH8~~BxR>!5#^?q~Z<^s=?En(T z81xi(%Z~87^HNR))$E@NsX18`cz(JnmT;`D?J@?wdkT(qmC2|T3Prg(b`9rNjsyx zp??Ee+F89`wW`jqxm&jFJ;FEV@`Z|i^IDs|40CNqCm;e9( literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V2.class b/lib/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V2.class new file mode 100644 index 0000000000000000000000000000000000000000..6d4cd0ffa80aac642a6218588f89d5c5d364c38a GIT binary patch literal 769 zcmah{O-~d-5Ph|?%Pixpz__mXEgKJj#$Gg@023mMF&WkaI9KeM?W}|IL1w#6_*q;q z@!-|O-((Cm!vs8lUS6fDt6sgXs$YM;{{XOwzJmrV8%-B2%n&xBJQb-qHli?z66~dU zCPF!lBO$}7E@Y&qVq0oC%qDTB0+|@K6=@@NUJzzB;w;v02-fmS;Gm6J8;*+`a0#!j zq*fJ;7>?e(9}N$JE&n6q&i2}1FgOTaGSNh7!qepy|DwDWHO^BRXO)&p#kzx=n6okO zVgVlE$^QxnZ6>d330>}RD8EXP$ZR4$goi596=T=MZS)8>=k6aLDMJ4WF)B0Z`CQ7J zbwcxPKIYsxpNBLuX{d^Q873U@{5+CLAd9&4>tIuVj;Dmzm!JH5{QsU2H?sS`cH&a!gKJjuqMQ8pwf+DA literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V3.class b/lib/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V3.class new file mode 100644 index 0000000000000000000000000000000000000000..9193e042c5631b081a5344daa2c9b034d5f7bedb GIT binary patch literal 580 zcmaJo6JGe_G4Th7U$J zx1+(>?pY6n!~S`z)f(GvGMY-wa9VFzi}HD>N$3j|WLdHlmkfpLa3UG179|@cz9XZ1 z;dr#OV}-8pY!RuH&o>MDQN;`wOXuHr{y!Ks%STDTP@d2%vi=MwOQ+QtD|cZMxpJt| zTt_SJefA`t1&(QeIeI1#vh;ljH;8ds8LdY19qctb-Xu(qL4qowITK(D+r(%9i{dV^ k)U?=qL&;iJryl{NHgK3Z)Ml!=gF#ih*dt`vCtVJ;AG3gjc>n+a literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.java b/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.java deleted file mode 100644 index 2dc637d..0000000 --- a/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.muyu.rule.common.engine.dataSet; - -import com.muyu.common.domain.DataValue; -import com.muyu.rule.common.basic.abstracts.DataEngineDataSetActuator; -import com.muyu.rule.common.exception.DeliteException; - - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.engine.row - * @Project：cloud-etl-rule - * @name：ENGINE_ROW_HANG_R1 - * @Date：2024/8/30 11:13 - */ - -public class ENGINE_DataSet_asdf_S1 extends DataEngineDataSetActuator { - - @Override - public void run() { - DataValue[][] dataValues = get(); - if (dataValues == null || "".equals(dataValues) || "null".equals(dataValues)) { - throw new DeliteException(); - }else { - System.out.println("数据检测无异常"); - } - } -} diff --git a/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_ytrrt_S2.java b/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_ytrrt_S2.java deleted file mode 100644 index 4668402..0000000 --- a/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_ytrrt_S2.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.muyu.rule.common.engine.dataSet; - -import cn.hutool.core.util.DesensitizedUtil; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; -import com.muyu.common.domain.DataValue; -import com.muyu.rule.common.basic.abstracts.DataEngineDataSetActuator; - - -/** - * @Author：张承志 - * @Package：com.muyu.rule.server.basic.engine.row - * @Project：cloud-etl-rule - * @name：数据集指定字段进行脱敏 - * @Date：2024/8/30 11:13 - */ - -public class ENGINE_DataSet_ytrrt_S2 extends DataEngineDataSetActuator { - - @Override - public void run() { - - DataValue[][] dataValues = get(); - - String dataValue = getDataValue(); - - JSONObject jsonObject = JSON.parseObject(dataValue); - - String key = (String)jsonObject.get("key"); - - for (DataValue[] value : dataValues) { - for (DataValue dataValue1 : value) { - if (dataValue1.getKey().equals(key)){ - dataValue1.setValue(DesensitizedUtil.mobilePhone((String) dataValue1.getValue())); - } - } - } - set(dataValues); - - } -} diff --git a/lib/com/muyu/rule/common/exception/DeliteException.class b/lib/com/muyu/rule/common/exception/DeliteException.class new file mode 100644 index 0000000000000000000000000000000000000000..7e056249328aef85351cb0d6700d7eb028bb368e GIT binary patch literal 986 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"张" - // 规则二：2个字则脱敏第二个字，如"张三"-->"张*" - // 规则三：3个字则脱敏第二个字，如"张三丰"-->"张*丰" - // 规则四：4个字则脱敏中间两个字，如"易烊千玺"-->"易**玺" - // 企业名称规则： - // 从第4位开始隐藏，最多隐藏6位。 - - if (StringUtils.isNotEmpty(custName)) { - char[] chars = custName.toCharArray(); - if (chars.length < 5) {// 表示姓名 - if (chars.length > 1) { - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < chars.length - 2; i++) { - sb.append("*"); - } - custName = custName.replaceAll(custName.substring(1, chars.length - 1), sb.toString()); - } - } else {// 企业名称 - int start = 4; - // 第一部分 - String str1 = custName.substring(0, start); - // 第二部分 - String str2 = ""; - if (chars.length == 5) { - str2 = "*"; - } else if (chars.length == 6) { - str2 = "**"; - } else if (chars.length == 7) { - str2 = "***"; - } else if (chars.length == 8) { - str2 = "****"; - } else if (chars.length == 9) { - str2 = "*****"; - } else { - str2 = "******"; - } - // 通过计算得到第三部分需要从第几个字符截取 - int subIndex = start + str2.length(); - // 第三部分 - String str3 = custName.substring(subIndex); - StringBuffer sb = new StringBuffer(); - sb.append(str1); - sb.append(str2); - sb.append(str3); - custName = sb.toString(); - } - } - return custName; - } - - /** - * 家庭地址脱敏 - * - * @param address - * @return - */ - public static String addressDesensitization(String address) { - // 规则说明：从第4位开始隐藏，隐藏8位。 - if (StringUtils.isNotEmpty(address)) { - char[] chars = address.toCharArray(); - if (chars.length > 11) {// 由于需要从第4位开始，隐藏8位，因此数据长度必须大于11位 - // 获取第一部分内容 - String str1 = address.substring(0, 4); - // 获取第二部分 - String str2 = "********"; - // 获取第三部分 - String str3 = address.substring(12); - StringBuffer sb = new StringBuffer(); - sb.append(str1); - sb.append(str2); - sb.append(str3); - address = sb.toString(); - } - } - return address; - } - - //下面代码是从别人博客看到的。 - - /** - * 定义所有常量 - */ - public static final int ONE = 1; - public static final int TWO = 2; - - /** - * 姓名脱敏 - * - * @param realName - * @return - */ - public static String desensitizedName(String realName) { - if (realName == null) { - return null; - } - if (realName.length() == ONE) { - return realName; - } else if (realName.length() == TWO) { - return realName.substring(0, 1) +"*"; - } else { - Integer length = realName.length(); - StringBuffer middle = new StringBuffer(); - for (int i = 0; i < realName.substring(1, length - 1).length(); i++) { - middle.append("*"); - } - return realName.substring(0, 1) + middle + realName.substring(length - 1, length); - } - } - - /** - * 详细地址脱敏 - * - * @param address - * @return - */ - public static String desensitizedAddress(String address){ - //江西省宜春市丰城市剑南街道人才教育小区41号丰城住总运营有限公司-->江西省宜春市丰城市剑南街道人才教育小区************* - if (StringUtils.isNotEmpty(address)) { - int length = address.length(); - int indes = address.indexOf("区"); - if (indes == -1) { - indes = address.indexOf("市"); - } - address = address.substring(0, indes + 1); - StringBuffer middle = new StringBuffer(); - for (int i = 0; i < length - indes; i++) { - middle.append("*"); - } - return address + middle; - } - return address; - } - - /** - * 对字符串进行脱敏操作 - * - * @param origin 原始字符串 - * @param prefixNoMaskLen 左侧需要保留几位明文字段 - * @param suffixNoMaskLen 右侧需要保留几位明文字段 - * @param maskStr 用于遮罩的字符串, 如'*' - * @return 脱敏后结果 - */ - public static String desValue(String origin, int prefixNoMaskLen, int suffixNoMaskLen, String maskStr) { - if (origin == null) { - return null; - } - StringBuilder sb = new StringBuilder(); - for (int i = 0, n = origin.length(); i < n; i++) { - if (i < prefixNoMaskLen) { - sb.append(origin.charAt(i)); - continue; - } - if (i > (n - suffixNoMaskLen - 1)) { - sb.append(origin.charAt(i)); - continue; - } - sb.append(maskStr); - } - return sb.toString(); - } - - /** - * 中文姓名，只显示最后一个汉字，其他隐藏为星号，比如：**梦 - * - * @param fullName - * @return - */ - public static String chineseName(String fullName) { - if (fullName == null) { - return null; - } - return desValue(fullName, 0, 1, "*"); - } -} diff --git a/lib/com/muyu/rule/common/utils/OssUtil.class b/lib/com/muyu/rule/common/utils/OssUtil.class new file mode 100644 index 0000000000000000000000000000000000000000..521ee1ea6cd622dff705d1b81e8cef10e1062a35 GIT binary patch literal 7728 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