From 5a5565345407e8967c5f98417dcb09794148b728 Mon Sep 17 00:00:00 2001 From: zhang chengzhi <3144712872@qq.com> Date: Sat, 7 Sep 2024 09:27:04 +0800 Subject: [PATCH] 11111 --- cloud-rule-common/pom.xml | 4 ++ .../abstracts/DataEngineDataSetActuator.java | 2 +- .../abstracts/DataEngineRowActuator.java | 2 +- .../abstracts/DataEngineValueActuator.java | 2 +- .../handler/DataEngineDataSetHandler.java | 4 +- .../basic/handler/DataEngineHandler.java | 3 +- .../basic/handler/DataEngineRowHandler.java | 5 +- .../basic/handler/DataEngineValueHandler.java | 4 +- .../muyu/rule/common/domain/DataValue.java | 49 ------------------ .../rule/common/domain/req/VersionAddReq.java | 12 +---- .../dataSet/ENGINE_DataSet_asdf_S1.java | 6 +-- .../common/engine/row/ENGINE_ROW_HANG_R1.java | 4 +- .../engine/value/ENGINE_VALUE_VFD1000_V1.java | 9 ++-- .../engine/value/ENGINE_VALUE_VFD1000_V2.java | 31 +++++++++-- ...z_V9.java => ENGINE_VALUE_VFD1000_V3.java} | 19 ++++--- ...ctionDiscard.java => DeliteException.java} | 12 ++--- .../main/java/com/muyu/rule/server/Main.java | 9 ++-- .../rule/server/OSSClassLoaderExample.java | 5 +- .../DataSourceDisposeController.java | 2 - .../RuleEngineVersionController.java | 13 ++--- .../service/RuleEngineVersionService.java | 6 ++- .../impl/RuleEngineVersionServiceImpl.java | 21 +++++--- .../abstracts/DataEngineDataSetActuator.class | Bin 1239 -> 1219 bytes .../abstracts/DataEngineRowActuator.class | Bin 1219 -> 1199 bytes .../abstracts/DataEngineValueActuator.class | Bin 1263 -> 1238 bytes .../handler/DataEngineDataSetHandler.class | Bin 765 -> 750 bytes .../basic/handler/DataEngineHandler.class | Bin 897 -> 897 bytes .../basic/handler/DataEngineRowHandler.class | Bin 750 -> 735 bytes .../handler/DataEngineValueHandler.class | Bin 1137 -> 1117 bytes .../muyu/rule/common/domain/DataValue.class | Bin 3407 -> 0 bytes .../common/domain/req/VersionAddReq.class | Bin 6859 -> 6859 bytes .../dataSet/ENGINE_DataSet_asdf_S1.class | Bin 988 -> 980 bytes .../engine/row/ENGINE_ROW_HANG_R1.class | Bin 1265 -> 1245 bytes .../value/ENGINE_VALUE_VFD1000_V1.class | Bin 1391 -> 1437 bytes .../value/ENGINE_VALUE_VFD1000_V2.class | Bin 1479 -> 781 bytes .../value/ENGINE_VALUE_VFD1000_V3.class | Bin 0 -> 592 bytes .../engine/value/ENGINE_phone_zzzzz_V9.class | Bin 1368 -> 0 bytes ...ionDiscard.class => DeliteException.class} | Bin 980 -> 986 bytes lib/com/muyu/rule/common/utils/OssUtil.class | Bin 7411 -> 7411 bytes pom.xml | 2 - 40 files changed, 99 insertions(+), 127 deletions(-) delete mode 100644 cloud-rule-common/src/main/java/com/muyu/rule/common/domain/DataValue.java rename cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/{ENGINE_phone_zzzzz_V9.java => ENGINE_VALUE_VFD1000_V3.java} (50%) rename cloud-rule-common/src/main/java/com/muyu/rule/common/exception/{ActionDiscard.java => DeliteException.java} (52%) delete mode 100644 lib/com/muyu/rule/common/domain/DataValue.class create mode 100644 lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.class delete mode 100644 lib/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.class rename lib/com/muyu/rule/common/exception/{ActionDiscard.class => DeliteException.class} (58%) diff --git a/cloud-rule-common/pom.xml b/cloud-rule-common/pom.xml index 1afedb3..71b5e2a 100644 --- a/cloud-rule-common/pom.xml +++ b/cloud-rule-common/pom.xml @@ -20,6 +20,10 @@ + + com.muyu + cloud-datasources-common + com.muyu cloud-common-core 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 c438d6d..aa92989 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 @@ -1,7 +1,7 @@ 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.domain.DataValue; import com.muyu.rule.common.basic.handler.DataEngineDataSetHandler; /** diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java index 64aca23..0fd2672 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java @@ -1,7 +1,7 @@ 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.domain.DataValue; import com.muyu.rule.common.basic.handler.DataEngineRowHandler; /** diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java index 018fe48..4c27b43 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java @@ -1,7 +1,7 @@ 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.domain.DataValue; import com.muyu.rule.common.basic.handler.DataEngineValueHandler; /** diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java index c4db393..5014718 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java @@ -1,6 +1,6 @@ package com.muyu.rule.common.basic.handler; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; /** * @Author：张承志 @@ -8,7 +8,7 @@ import com.muyu.rule.common.domain.DataValue; * @Project：cloud-etl-rule * @name：DataEngineValueHandler * @Date：2024/8/29 14:35 - * @Description:数据值处理对象 + * @Description:数据集作用域 */ public class DataEngineDataSetHandler { diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineHandler.java index 545e1bc..df49518 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineHandler.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineHandler.java @@ -4,7 +4,7 @@ package com.muyu.rule.common.basic.handler; * @Author：张承志 * @Package：com.muyu.rule.server.basic * @Project：cloud-etl-rule - * @name：DataEngineHandler + * @name：规则引擎作用域 * @Date：2024/8/29 14:21 */ public class DataEngineHandler { @@ -19,6 +19,7 @@ public class DataEngineHandler { public static T get(){ return (T) dataEngineHandler.get(); + } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java index b838026..4091e2b 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java @@ -1,14 +1,13 @@ package com.muyu.rule.common.basic.handler; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; /** * @Author：张承志 * @Package：com.muyu.rule.server.basic.handler * @Project：cloud-etl-rule - * @name：DataEngineValueHandler + * @name：数据记录/行作用域 * @Date：2024/8/29 14:35 - * @Description:数据值处理对象 */ public class DataEngineRowHandler { diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java index 691a946..c84b9cd 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java @@ -1,13 +1,13 @@ package com.muyu.rule.common.basic.handler; import com.muyu.common.core.text.Convert; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; /** * @Author：张承志 * @Package：com.muyu.rule.server.basic.handler * @Project：cloud-etl-rule - * @name：DataEngineValueHandler + * @name：数据值作用域 * @Date：2024/8/29 14:35 */ public class DataEngineValueHandler { diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/DataValue.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/DataValue.java deleted file mode 100644 index ab67ae9..0000000 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/DataValue.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.muyu.rule.common.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author：张承志 - * @Package：com.muyu.rule.common.domain - * @Project：cloud-etl-rule - * @name：Data - * @Date：2024/8/27 9:18 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class DataValue { - - /** - * 键 - */ - public String key; - - /** - * 类型 - */ - -public String type; - - - /** - * 描述 - */ - -public String label; - - /** - * 值 - */ - -public Object value; - - - - - -} diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/req/VersionAddReq.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/req/VersionAddReq.java index 48b56ff..0f6af56 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/req/VersionAddReq.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/domain/req/VersionAddReq.java @@ -25,12 +25,11 @@ public class VersionAddReq { * 版本名称 */ private String versionName; + /** * 版本类名 */ - private String className; - /** * 版本编码 */ @@ -67,13 +66,4 @@ public class VersionAddReq { private String remark; - - - - - - - - - } 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/dataSet/ENGINE_DataSet_asdf_S1.java index b7e0bd8..41db869 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/dataSet/ENGINE_DataSet_asdf_S1.java @@ -1,8 +1,8 @@ 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.domain.DataValue; -import com.muyu.rule.common.exception.ActionDiscard; +import com.muyu.rule.common.exception.DeliteException; /** @@ -20,7 +20,7 @@ public class ENGINE_DataSet_asdf_S1 extends DataEngineDataSetActuator { DataValue[][] dataValues = get(); if (dataValues == null || "".equals(dataValues) || "null".equals(dataValues)) { - throw new ActionDiscard(); + throw new DeliteException(); }else { System.out.println("数据检测无异常"); } 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 index f039103..b160dcc 100644 --- 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 @@ -1,7 +1,7 @@ package com.muyu.rule.common.engine.row; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.basic.abstracts.DataEngineRowActuator; -import com.muyu.rule.common.domain.DataValue; import java.util.Arrays; import java.util.HashSet; @@ -29,6 +29,8 @@ public class ENGINE_ROW_HANG_R1 extends DataEngineRowActuator { // 将 Set 转换回数组 DataValue[] uniqueArray = uniquePeople.toArray(new DataValue[0]); + + System.out.println(Arrays.toString(uniqueArray)); } 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 index b848683..292175d 100644 --- 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 @@ -1,13 +1,14 @@ package com.muyu.rule.common.engine.value; -import com.muyu.rule.common.domain.DataValue; +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：ENGINE_VALUE_VFD1000_V1 + * @name：非空抛出异常 进行删除 * @Date：2024/8/29 15:51 */ public class ENGINE_VALUE_VFD1000_V1 extends DataEngineValueActuator { @@ -15,11 +16,9 @@ public class ENGINE_VALUE_VFD1000_V1 extends DataEngineValueActuator { public void run() { DataValue dataValue = get(); if (dataValue.getValue() == null){ - System.out.println("数据为空，需要丢弃"); + 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 index 386d6da..52f6a44 100644 --- 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 @@ -1,8 +1,10 @@ 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 com.muyu.rule.common.domain.DataValue; -import com.muyu.rule.common.utils.Desensitization; + +import java.time.LocalDateTime; /** * @Author：张承志 @@ -14,9 +16,30 @@ import com.muyu.rule.common.utils.Desensitization; public class ENGINE_VALUE_VFD1000_V2 extends DataEngineValueActuator { @Override public void run() { + DataValue dataValue = get(); - String string = Desensitization.mobilePhoneDesensitization((String) dataValue.getValue()); - System.out.println("手机号脱敏的结果是====>"+string); + if (dataValue.getValue()==null){ + + DataType type = dataValue.getType(); + //如果为空,添加默认值 + //String string = DataType.convertTypeString((String) ); +//为整数 默认值为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_phone_zzzzz_V9.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java similarity index 50% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java index d08fb9b..5115649 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.java @@ -1,23 +1,26 @@ package com.muyu.rule.common.engine.value; -import com.muyu.rule.common.domain.DataValue; +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：非空 + * @name：字典字段 转换 * @Date：2024/8/29 15:51 */ -public class ENGINE_phone_zzzzz_V9 extends DataEngineValueActuator { +public class ENGINE_VALUE_VFD1000_V3 extends DataEngineValueActuator { @Override public void run() { + DataValue dataValue = get(); - if (dataValue.getValue() == null){ - System.out.println("数据为空"); - }else { - System.out.println("数据非空:"+dataValue.getValue()); - } + + + + + + + } } diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/exception/ActionDiscard.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/exception/DeliteException.java similarity index 52% rename from cloud-rule-common/src/main/java/com/muyu/rule/common/exception/ActionDiscard.java rename to cloud-rule-common/src/main/java/com/muyu/rule/common/exception/DeliteException.java index 7ddb8a1..ff43847 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/exception/ActionDiscard.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/exception/DeliteException.java @@ -7,24 +7,24 @@ package com.muyu.rule.common.exception; * @name：ActionDiscard * @Date：2024/8/26 22:08 */ -public class ActionDiscard extends RuntimeException { - public ActionDiscard() { +public class DeliteException extends RuntimeException { + public DeliteException() { super(); } - public ActionDiscard(String message) { + public DeliteException(String message) { super(message); } - public ActionDiscard(String message, Throwable cause) { + public DeliteException(String message, Throwable cause) { super(message, cause); } - public ActionDiscard(Throwable cause) { + public DeliteException(Throwable cause) { super(cause); } - protected ActionDiscard(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + protected DeliteException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { super(message, cause, enableSuppression, writableStackTrace); } } 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 1057482..63c74b3 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 @@ -1,6 +1,7 @@ package com.muyu.rule.server; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; +import com.muyu.common.enums.DataType; import com.muyu.rule.common.basic.BasicEngine; import java.util.Map; @@ -47,7 +48,7 @@ public class Main { System.out.println("字段规则测试:"); DataValue dataValue = DataValue.builder() - .type("String") + .type(DataType.valueOf("String")) .label("姓名") .key("name") .value(null) @@ -77,10 +78,6 @@ public class Main { DataValue[][] dataValuesSet = new DataValue[3][3]; - dataValuesSet[0][0] = new DataValue("name","String","姓名","张三"); - dataValuesSet[0][1] = new DataValue("age","int","年龄",22); - dataValuesSet[0][2] = new DataValue("sex","String","性别","张三"); - dataValuesSet[1][0] = new DataValue("name","String",null,"张三"); BasicEngine engineDataSetAsdfS1 = engineDataSetMap.get("ENGINE_DataSet_asdf_S1"); 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 6160220..975bf5a 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 @@ -1,6 +1,7 @@ package com.muyu.rule.server; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; +import com.muyu.common.enums.DataType; import com.muyu.rule.common.utils.OssUtil; import com.muyu.rule.common.basic.BasicEngine; import com.muyu.rule.server.complie.SourceCodeComplier; @@ -56,7 +57,7 @@ public class OSSClassLoaderExample { BasicEngine object =(BasicEngine)aClass.newInstance(); DataValue dataValue = DataValue.builder() - .type("String") + .type(DataType.valueOf("String")) .label("姓名") .key("name") .value(null) diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/DataSourceDisposeController.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/DataSourceDisposeController.java index d176594..9660b72 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/DataSourceDisposeController.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/DataSourceDisposeController.java @@ -1,9 +1,7 @@ package com.muyu.rule.server.controller; import com.muyu.common.core.domain.Result; -import com.muyu.rule.common.domain.DataValue; import com.muyu.rule.server.service.SourceDisposeService; -import io.swagger.v3.oas.annotations.Operation; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; 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 1fa8173..d114dc8 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 @@ -2,7 +2,7 @@ package com.muyu.rule.server.controller; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.muyu.common.core.domain.Result; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.domain.RuleEngineVersion; import com.muyu.rule.common.domain.req.VersionAddReq; import com.muyu.rule.server.service.RuleEngineVersionService; @@ -106,15 +106,12 @@ public class RuleEngineVersionController { * @return */ - @PostMapping("/deposit") - public Result deposit(@RequestBody VersionAddReq ver ){ + @PostMapping("/deposit/{type}}") + public Result deposit(@PathVariable("type")Integer type){ - log.info("传入参数{}"+ver); + log.info("传入参数{}"+type); - String versionClazz = ver.getVersionClazz(); - String className = ver.getClassName(); - - // versionService.Upload(versionClazz,className); + String versionClass = versionService.deposit(type); return Result.success(); } diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java index f0c7f13..7066f3f 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java @@ -1,7 +1,7 @@ package com.muyu.rule.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.domain.RuleEngineVersion; import java.util.List; @@ -73,5 +73,7 @@ public interface RuleEngineVersionService extends IService { * @param dataValue ktvl数据 */ - void testEngine(String className,DataValue dataValue); + void testEngine(String className, DataValue dataValue); + + String deposit(Integer type); } 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 b4866b1..a835093 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 @@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.enums.SystemYesNo; -import com.muyu.rule.common.domain.DataValue; +import com.muyu.common.domain.DataValue; import com.muyu.rule.common.domain.RuleEngineVersion; import com.muyu.rule.common.utils.OssUtil; -import com.muyu.rule.server.EngineConfig; import com.muyu.rule.common.basic.BasicEngine; import com.muyu.rule.server.load.ExternalClassLoader; import com.muyu.rule.server.mapper.RuleEngineVersionMapper; @@ -132,11 +131,6 @@ public static final String importClassAndPackPath="home/lib/"; public void complierClass(String className, String versionClazz) { log.info("======>"+versionClazz); String ossFilePath = className + Suffix_JAVA; - String ossFilePath2 = className + Suffix_CLASS; - EngineConfig engineConfig = new EngineConfig(); - - // String filePath ="home/"+ossFilePath; - String filePath = engineWorkSourcePath + ossFilePath; //创建服务器项目容器的java源码文件目录路径 File serverFile = new File(engineWorkSourcePath, ossFilePath); //如果目录不存在,则创建目录 @@ -166,6 +160,7 @@ public static final String importClassAndPackPath="home/lib/"; } else { System.out.println("错误"); } + OssUtil.ssss(className); @@ -248,6 +243,18 @@ public static final String importClassAndPackPath="home/lib/"; valueBasicEngine.execution(); } + @Override + public String deposit(Integer type) { + + + + + + + + return null; + } + /** * 修改激活 * diff --git a/lib/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.class b/lib/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.class index aede0f259a8df02e2f1442e959fa44dcd3398177..f14a67d7f7f74873db3e0790bca2c17278b14aae 100644 GIT binary patch delta 75 zcmcc4d6;uT53jmLbhJ-$ey)CQX=UledAfXR8k)!=_qupgQ24Twr!oFwOqe{8$!+3% LiOpY_9y0;}CSx5z delta 94 zcmX@id7X1YkC2W=bhJ-$ey)CQX=SN?QE5)<#F@In+8UbZ!jrQYWhZ{j6~vI(oW&^4 T$e230iOG!xq<`~qraz1TPQM}i diff --git a/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.class b/lib/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.class index 7e2451536aefb59d7eaa558c6d7c25f11e8ba18e..1e430775c9270b822ba2c7c0ca5ae8e71337cc9c 100644 GIT binary patch delta 79 zcmX@ixt?=E2alRYv`=z=u6}N5W$ENRM#+hrM0iy-G*JX)Cw|T3Rz?VI&SMm2WQ?EO Q#N;|TpHX7-6Q=u&07Y^eT>t<8 delta 68 zcmZ3_d6;uT2eYI7q_a0PjY^)er{=H>Et{{iHVy;c~mqsQN=zKa4H}vI?JVmB0o8a$%`>= S@>(XB$@z@pn|YZZF#-S;ULZ&S delta 78 zcmcb{`JQt^7n7F8H2%BT(#p6tiu#h5&K TCX>tLSByL$eVe~9Jz@j^7d#qx diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.class index cafc743fdcc67d6c44215643998ff3a8cf49fef6..7337d3b5fc3a392e11862437c0fbe896da2fedff 100644 GIT binary patch delta 67 zcmey%`i^zNaUPZEXrJW#T>aeA%F@ZZ86_uv+`+4^fhwrOr>3EaDkM2snCTS&d8-*U delta 82 zcmaFI`j>UWaY4=KXrJW#T>aeA%2NHJ(wx-E8yO`hzS$w9qk%<6M_5|}tB%PmOs@bc C*dEpZ diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineHandler.class index 9aa4fd5c55aa25ccdbd5c20231a0525cb62758be..7ef02a5da909230fe1f799084e8ef91f613aca6b 100644 GIT binary patch delta 17 YcmZokpXB^p{oK;Z(#abcB`1E^z@w&tBBsNus-cM@A~~6ZDV~vMat4zP WBj4nuOm^IY42%r23=9lR3~~U4l^SXQ delta 73 zcmcc5`i^zNab}HZpNStuC%<46ocMYJi#CEg`2eFZtCof)Oum4TcXA|?4I}^LX-sz9 PLJW)yvJ4CiObl`W13VUx diff --git a/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.class b/lib/com/muyu/rule/common/basic/handler/DataEngineValueHandler.class index 99ebb1d554bdb47aa537d88e152afda4c7269a64..48f0ef778478ba62596e6c7e7d44c98622a201b3 100644 GIT binary patch delta 93 zcmey!ahGGlaZZKg{9OIq(#q1wF^m!u-^TH%XlVMt#5Tt;$}w`QYQP16iX^2p!x$Mj YQxZ!O!xD2!QyCeQP^35CW}3zb0Nhv}y#N3J delta 98 zcmcc1@sVS~aX!`L{9OIq(#lf(qSBnyi5JQQH8nJS&;%tmXECxd3TSCyNKBs0B*?Fh LA-wq*({x4vDNiJ~ diff --git a/lib/com/muyu/rule/common/domain/DataValue.class b/lib/com/muyu/rule/common/domain/DataValue.class deleted file mode 100644 index e500fcdc7507da569b33ece1d9e0f54c96d1bbf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3407 zcmb_f-*XdH6#h2dUrDz#6k13@EE;T^w!|NZl2AknNTn%AvB(dVZMw9fX|^UCW|;BW z@yQvVbe!>3W*i=ru`q)(j=tcGf0Kyc*}X~AG%|f~Cb{?AbH8)$J?A@nHu>wH$G-uX z#EONOhNDG)HM?5BThCVOWiQLss$a=2`m1iKl0EGP?z~&Bd+DZhs$MEDdesCp=nf2+ z8qDLRN+~#@p=)GxJ`Njk3ke6^a5Nm+mV276cy~4Q&D?hHxY@E>S<21@)ly|CFaCBo z=oM#raCglU#ZCu(qA<$tf>##JZU_AspyrNTceAGp3%9*ukWUb{*Fg${8tkH5IrCZF zEoX*pCuN3RKZzk?TWfblJP!Fjpf?vc?Jth!(VLpW&RB?m8y=j28Nku%zRa#BrP z9&+%CxU}f?G?KOzB)QQU?Lt&E z8gk6wwkl#v!R1MR6kG31sp8GnR~NkMWp|+*lI<7W^1NFu$yzD(V7bKjhPQVf-J3N< z^QMYWDH)w-7z7Au%rvEtsz_7>ZL(`5g?5_Hy7Yr(uS&SwDjgPkJX9$;R7-hlNJM(I z2sgqq*U%m9s8u4|QuVI3)T(DLaEmJicTMHOxOi#0aE3RTW|&p4RxbxkXLPiYj!rVu z%CDJLUhKe+qStW#|Em%vBr)gLt3~f@NyyvLY%Pc7(P5OcUM(ni!Y}ztp7Q;m7F6A} zf)_0Ni?v=8A1Ck$KDBUDs+$(+jc2Y@x#O>Rs(C~Of7UGqewB~!x2-`aVC3|iTUji7 zwe*bduhiG_TMM~Gv&m4(p#%JS3%*eZEh^<=$}N}YN`aTRQPhxW=3#{8F{zCY2`@5- zyoeC;GO3MfaHcC2uR2wBYc)@j)U;LY*}@Wg@0PT5iq=9&!-3~RSv65=aFD%eh>b;O z|7U}zq)BfMXSU>UW+Ud@i#XoG+uT3K)evGF0sB{IS0AD4C(3LG98JzZk|UcfM?q&f zi`K~e0!yH=7U*8&sc|9zj`K|>uGm&Nwj1}f8z1Os%>LWKIN5G|sG~9abO+;I?Z#sr zjZfemWt?M>k|Q%Swhrs(wxD}M>wyTNf|lF~2a>Cko&EG|*N<>0e%|fuC%IieQUl`W z6s9-|9h>6XwOv0_L*j?;)X0zaIb-jpzXxNPA7JSB$Nqr*9gME~W52^LjAtHVPq?J8 zZ+4tRPM`P_-6{PEcHV=sZa7bhr_OQhlgN+?h~m1uzU`@D5mO94k*u0_!_xqN`rVa)yb9%oq8F{JSo z&QjNf48FvBlyr_OI7i7q0Uo9)nJ5$WJ|zoP*1>s7HooSQIzuUrZ?KQp0VFWXdmKft zW&e#G7VM`OurS1rtv$uwNR0o7$dmcINilkivs9`f6i9HbPiJeP8qMGgh7=LXUn+{w zFKB1cdM%khu1|)v?N8>HNt&G;y9aCHAr9XZeLAPhMoL#Zwon;u4d;w-i!6plcFJgM zWpZY?Wj43SEv@!q8{sE;J6L<@k7)2M0vVb{CI!@qqT&85; zD)!(*N@kemA7MYELbqUR8dD2Rdq%^JbxaifFdBdcM&GPbFtY`=fo#_*u(cVyf$y+E z6UI2-Y=0-i#tsY!9g=!}hxyGsW}s+qX%W{^Cmv9llZ;)77-nI{xB><YnkzN z^kgR1k<6s@b!=$|JHs}2B(iE&&!B2^^c22qr1%Eq9{^J-k~9l>A@SdcI(g#-!js#3 rPG5&ktm7lPijl@^oW+@j>y&KHH~3w^B3FGxXw-Rpu5Mu&w~_i68AgJL diff --git a/lib/com/muyu/rule/common/domain/req/VersionAddReq.class b/lib/com/muyu/rule/common/domain/req/VersionAddReq.class index bba1219ae432dad93802332caad26b6b3a4d0da6..65e96fe212dfa1d2660f690b9422116c207cfe95 100644 GIT binary patch delta 74 zcmX?YdfIe@B_E^8hbaRUIJb{G5r delta 74 zcmX?YdfIe@B_E^e%sL5V83I{0jOJjzGru~cEtu5+WI2Oa KoA>hbaRUIKei#D) diff --git a/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.class b/lib/com/muyu/rule/common/engine/dataSet/ENGINE_DataSet_asdf_S1.class index 20bfa517dd4b0725b5c3843c80a8f9d517ad51c3..4099efdbcaf398be9ac2f7bc3ebfec6c8c19200e 100644 GIT binary patch delta 81 zcmcb^euaI)PChja&FE;KC{JF>;sXFBwH>tp delta 106 zcmcc1`H^$NS|KeB&1j$G{9OIq(#lf(qSBny$@z>D6E98SQ$-ie7tp|>bTcDU4gl6hwq^8F53!eYtTnG4VJdgrF?OpwW2n{j@_5{|}F=~BTcoL`-b zy5y^Tc6W@n2?N5*LQWZd3^T%%w7_LLb6U=oipE|hpDSnf|9uxUh9Pmy{Ifw06$1(! z@G*F!sbllPH1cLKYaEo%a>Z;icGv+whGYyY2w+6)u{ifoPeBDCjEOI{+ru%Ah>QsZ zQH!Dqld0l~DMFWSd8obR6ZaBF0?RU1tn^ipu)VQ0(XfTtrU=?~wk=Zj&6^nU4KP}O zL$857kRd^*-Psh~m?T?i1z-x(F^L3vNO;ewy+4q;ZXzQjQ&?=-wNf5Xwf{GSxijbjQZCVsT zM7b~#X%z(hg|=q3DE~l2_i3wQn7L=pJ@?!@b84CRve(C5&KH z#F!=>=gYbWHp!!UKbzqTdX**lmOix|Ag?$WEx@4Of!z`iFhFNZgR~+@*wPdrgfQJ0 z)J9e--Xyg^F{lff$?3=9mm3`!HZ*6^rkX!<1Q=j!K{R+diuD>3oD0H*?iZ)M5Fz{eoM z!yw8a#>l{)o>~%8S&+)epoFALAE-PxKTkh3uQaz<-zBjm5v0a?atTvAmlCqsg4T=- zyul@j$=SY%1tEz^IjNH!nRO;VWD%_w2RcZffe{E97+AHoGcaxhGME@7fFv7OP=G-a z$mW44V31;v2J#pgWWcf@%?UsrGmsY2+Qz`{qrHuR_c#LwkP`LNr-_3$QEH> zWe@|JB*7rapaV8lj6s(Pq!nr`D+4csEQ1`-KzX1j2Lt0D20?aUC@?Z80QpP|iU79E BJ!Sv^ literal 1479 zcma)6O-~d-5Pglnz&Hx>A%cjafPfzZe(Qh=3nGz+hrL`#)U$6~>y`H7v3kH`(s#>Z>zT5O)F3Nc9w@SXY*{R1D?~NJ;gPj_6yP%8SX}6BBvv+Rlra`CVi=I zGVB{1%9v{`PINI0S0#(IbSZHn6n-eRe9E;{K0}wMveFgvOUf5}HU|bP zB$T+EN>yc3Bf4?SK#zsvII&ybTBwCb=~EGk&^ zMP60}i#+R+r6sL$+|BSn#_O`NRxinr!Kq&I|LGftP98)gs4-6sTQ2PB>Ueuvh?+S} z${Wl3v*d(qE~qHTi5aRML-$`g_k0{kC7D!86B=K+C-joahfVdkX5u<-7;xg;k1_P^ za7ceuEepF;-cmVc=-#Pdjp0>gZp)4((7W8vyCUpME43W0ID0i$Sat<2uC0hF?vE<` z%l%*3d}W9fcijc4h0_4K_Pxbt&x>!izin*&Sbtx9x$*t=`u9&Sif`W(U%eZr-%Z9~ z&HBCwQZ5fe5gM4F>$&IX)lOs}#nAI_S1MZR_~@m_r-oV^G_v?@qj8v4HqDIYy5TLb z_sRAd8slxyqj8o-tK@)lI8Q4^A-{tQ@ncE0W5b&;(q}et;0szmqW#_n96h^DoY+L) z4rmK%$@vhmx1t$sbWPh6f)gc>GC>`VU<9K?)QkhTfQt#qC5o)UWn7`Tf%dM_e;l`H NWzyGeOkxV1zW^_WoDl#3 diff --git a/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.class b/lib/com/muyu/rule/common/engine/value/ENGINE_VALUE_VFD1000_V3.class new file mode 100644 index 0000000000000000000000000000000000000000..f80dc6538e9babb3b6fb7d706d4deb27aeb0090a GIT binary patch literal 592 zcma))%}&BV6ot}M8KFdY}9Vav`lbJf0DLC;$ykd#Dx#w zLm6)i0T+_EIg>kc?$9;6 p42$LtRVlRCctgorcBelD$Zg;-Bh+TDIl-W=UF?xE?2|8t+7D+!i5&m{ literal 0 HcmV?d00001 diff --git a/lib/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.class b/lib/com/muyu/rule/common/engine/value/ENGINE_phone_zzzzz_V9.class deleted file mode 100644 index ffefb055ed2f4588d210758b7f359c9e9a7d472f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1368 zcma)+TTc@~6vzL=ZQHsOC^x}7aw{n79if2H3QAJYq@+IhK&IPCyRhA9c4tZ8JNRhg zi@q9PjQW7455AiCISj_{V2o$mjg-)+O**r4_MG3j&VKz>{S06ccVcKktA;im?dV`w zFlE^&`@6p3`nE9WRF;mB=bmL6Jnt!&o60lpbH$gPqUDGjw|#NfR6bYIW$0M297`=R zv`!{-F+>p65Yur2I>T&Jw5VZ>oq%I3uRmB_U*4>gq$4)>g5PFtj$lQh7?P98OjATb zmbvBBf~tj+iXo0J4c$6=kYE`5FDr%!xv2pd`pDN7-{FSMouct5za>nSilPtw8U}O> z;v_@&p+a`oQ=&|PN}mGlubW!Zcvh2L0gqyMt$MzkRBHe^ZU&G|p%^ ztK%HbGxXMYN39sNO2Duk!cI1XL{Q5qrjoe?wQ)qpMT{~Gmie|wOULBuiKR;PNmX-y<(3PRyuKVS@a5s3~CP^YAO>XD7YX#>}*rrMr(dU}?<=?GM zQOR7Na*GydqQcrwG^ZWwGDBxpadUf(SHf^&S?Rl`Sh0eDhno)5Oi*O%-90H)FwK=U zp-Qsgb#>rc4A*f(!_Agv5L2|@!W49ujs6TDcZ_>jMk><9YwUnTNyUh@<58RKJuV~=r8BO4-;|Mox zbI%i=2I|1ru{@iFuVInl?B7-C{?~KG1-kkzG?}241z#3g$LM6x&S-C+`Uv*E_IjMw z;5E>R30n2K0w$596T{RW<2`}}(21#iXqoAKbbdkn19}rf`#AL)33?2KRq_s!1o&12 z_yLLl=%%%Y@CmxUeIy^Kxf`e>LwD^M!89(B+skATMaxeNYKX@PG(&% diff --git a/lib/com/muyu/rule/common/exception/ActionDiscard.class b/lib/com/muyu/rule/common/exception/DeliteException.class similarity index 58% rename from lib/com/muyu/rule/common/exception/ActionDiscard.class rename to lib/com/muyu/rule/common/exception/DeliteException.class index 675df8f59dfe2957ac9b03594359a1d37e97a1c0..7e056249328aef85351cb0d6700d7eb028bb368e 100644 GIT binary patch delta 79 zcmcb@ev5s=e@4AYjPm?0sX3V?sjd~tsRbpO`FWFd7|odse6Yz(WULVoK~uh2nrSB^ E09Z8}(*OVf delta 73 zcmcb`euaI)e@2~2jPksW$t9Wjc`lj7$%#cNll2(Qne==x#iugX@Cl(P-K@y8lMw)- CWf=(o diff --git a/lib/com/muyu/rule/common/utils/OssUtil.class b/lib/com/muyu/rule/common/utils/OssUtil.class index 42cc1fd6203dde4588f1e015833071acc32689e5..b688fb7daba7efb98ae896d955a51b0f179206ed 100644 GIT binary patch delta 50 zcmext`Pp*AYH8I=4D1Y-859|=Fz7SfWH4g5%3#cJjlm7b_GGxu;Kgu*A(G+F<_prw Fi~z8z5Cs4L delta 50 zcmext`Pp*AYH8JT4D1Z&859{VFz7Q}WiVp6$Y9KHiNOuX_GGxs;Kgu-A(G+7<_prw Fi~y|a58VI& diff --git a/pom.xml b/pom.xml index b3b91ae..d7cff34 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,4 @@ UTF-8 - -