diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/context/ConnectionPoolContextHolder.java b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/context/ConnectionPoolContextHolder.java index 2660f13..4ada122 100644 --- a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/context/ConnectionPoolContextHolder.java +++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/context/ConnectionPoolContextHolder.java @@ -19,13 +19,6 @@ public class ConnectionPoolContextHolder { */ private final Map druidDataSourceMap=new ConcurrentHashMap<>(16); - /** - * 获取所有数据源 - */ - public Map getMap(){ - return this.druidDataSourceMap; - } - /** * 将数据源存入上下文中 */ @@ -46,4 +39,11 @@ public class ConnectionPoolContextHolder { public boolean hasKey(Long id){ return this.druidDataSourceMap.containsKey(id); } + + /** + * 删除数据源 + */ + public void remove(Long id){ + this.druidDataSourceMap.remove(id); + } } diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/service/ConnectionPoolService.java b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/service/ConnectionPoolService.java index 396540c..f27b2de 100644 --- a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/service/ConnectionPoolService.java +++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/service/ConnectionPoolService.java @@ -32,7 +32,7 @@ public class ConnectionPoolService { public void init(List dataSourceList){ for (DataSource dataSource : dataSourceList) { try { - connectionPoolContextHolder.put(dataSource.getId(), createDataSource(dataSource)); + this.put(dataSource); } catch (Exception e) { throw new RuntimeException(e.getMessage()); } diff --git a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-common/src/main/java/com/ruoyi/dataTransform/domain/req/TestDataReq.java b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-common/src/main/java/com/ruoyi/dataTransform/domain/req/TestDataReq.java index 2dee120..41b6079 100644 --- a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-common/src/main/java/com/ruoyi/dataTransform/domain/req/TestDataReq.java +++ b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-common/src/main/java/com/ruoyi/dataTransform/domain/req/TestDataReq.java @@ -1,6 +1,6 @@ package com.ruoyi.dataTransform.domain.req; -import com.ruoyi.ruleEngine.client.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-common/src/main/java/com/ruoyi/dataTransform/util/DataExtractUtil.java b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-common/src/main/java/com/ruoyi/dataTransform/util/DataExtractUtil.java index ae1fc4d..fff952a 100644 --- a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-common/src/main/java/com/ruoyi/dataTransform/util/DataExtractUtil.java +++ b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-common/src/main/java/com/ruoyi/dataTransform/util/DataExtractUtil.java @@ -1,6 +1,6 @@ package com.ruoyi.dataTransform.util; -import com.ruoyi.ruleEngine.client.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; import java.sql.*; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/consumer/EngineVersionConsumer.java b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/consumer/EngineVersionConsumer.java index d87eee1..b8604c3 100644 --- a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/consumer/EngineVersionConsumer.java +++ b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/consumer/EngineVersionConsumer.java @@ -2,8 +2,7 @@ package com.ruoyi.dataTransform.consumer; import com.alibaba.fastjson2.JSON; import com.rabbitmq.client.Channel; -import com.ruoyi.ruleEngine.client.config.RuleEngineVersionFactory; -import com.ruoyi.ruleEngine.client.util.RuleEngineUtil; +import com.ruoyi.ruleEngine.client.service.RuleEngineService; import com.ruoyi.ruleEngine.constant.QueueNameConstants; import com.ruoyi.ruleEngine.domain.EngineVersion; import lombok.extern.log4j.Log4j2; @@ -15,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import java.io.IOException; -import java.util.Map; /** * 引擎版本消费者 @@ -31,7 +29,7 @@ public class EngineVersionConsumer { private RedisTemplate redisTemplate; @Autowired - private RuleEngineVersionFactory ruleEngineVersionFactory; + private RuleEngineService ruleEngineService; @Autowired private MessageConverter messageConverter; @@ -47,12 +45,10 @@ public class EngineVersionConsumer { String messageId = message.getMessageProperties().getMessageId(); try { Long count = redisTemplate.opsForSet().add(QueueNameConstants.VERSION_MESSAGE, messageId); - if (count > 0) { + if (count != null&&count > 0) { // 正常消费消息 - // 编译 - Map bytecode = RuleEngineUtil.compileVersion(engineVersion); // 新增或替换规则内容 - ruleEngineVersionFactory.put(engineVersion.getId(),bytecode); + ruleEngineService.put(engineVersion); // 消费成功 手动确认 channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); log.info("引擎版本消费者接收到消息，消息内容：{}，消费消息成功！", JSON.toJSONString(engineVersion)); diff --git a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/controller/DataExtractController.java b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/controller/DataExtractController.java index 599aed5..0aa3f8a 100644 --- a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/controller/DataExtractController.java +++ b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/controller/DataExtractController.java @@ -4,7 +4,7 @@ import com.ruoyi.common.core.domain.Result; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.dataTransform.domain.req.RandomDataReq; import com.ruoyi.dataTransform.service.DataExtractService; -import com.ruoyi.ruleEngine.client.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/DataExtractService.java b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/DataExtractService.java index 5d4628e..e4e8af2 100644 --- a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/DataExtractService.java +++ b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/DataExtractService.java @@ -1,7 +1,7 @@ package com.ruoyi.dataTransform.service; import com.ruoyi.dataTransform.domain.req.RandomDataReq; -import com.ruoyi.ruleEngine.client.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; import java.util.List; /** diff --git a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/impl/DataExtractServiceImpl.java b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/impl/DataExtractServiceImpl.java index 4a796f2..ffde7b5 100644 --- a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/impl/DataExtractServiceImpl.java +++ b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/impl/DataExtractServiceImpl.java @@ -5,7 +5,7 @@ import com.ruoyi.dataAsset.service.ConnectionPoolService; import com.ruoyi.dataTransform.domain.req.RandomDataReq; import com.ruoyi.dataTransform.service.DataExtractService; import com.ruoyi.dataTransform.util.DataExtractUtil; -import com.ruoyi.ruleEngine.client.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/impl/EngineOperationServiceImpl.java b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/impl/EngineOperationServiceImpl.java index 67ca211..602a247 100644 --- a/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/impl/EngineOperationServiceImpl.java +++ b/ruoyi-modules/ruoyi-data_transform/ruoyi-data_transform-server/src/main/java/com/ruoyi/dataTransform/service/impl/EngineOperationServiceImpl.java @@ -4,20 +4,20 @@ import com.ruoyi.common.core.domain.Result; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.dataTransform.domain.req.TestDataReq; import com.ruoyi.dataTransform.service.EngineOperationService; -import com.ruoyi.ruleEngine.client.config.RuleEngineVersionFactory; -import com.ruoyi.ruleEngine.client.context.DataModelContextHolder; -import com.ruoyi.ruleEngine.client.context.DataSetContextHolder; -import com.ruoyi.ruleEngine.client.context.RecordContextHolder; +import com.ruoyi.ruleEngine.client.engine.context.DataModelContextHolder; +import com.ruoyi.ruleEngine.client.engine.context.DataSetContextHolder; +import com.ruoyi.ruleEngine.client.engine.context.RecordContextHolder; import com.ruoyi.ruleEngine.client.dynamicLoad.DynamicLoader; import com.ruoyi.ruleEngine.client.engine.action.ActionRecords; import com.ruoyi.ruleEngine.client.engine.action.ActionRemove; import com.ruoyi.ruleEngine.client.engine.action.ActionReplace; -import com.ruoyi.ruleEngine.client.model.DataModel; -import com.ruoyi.ruleEngine.client.model.DataSetModel; -import com.ruoyi.ruleEngine.client.model.RecordModel; -import com.ruoyi.ruleEngine.client.model.process.DataModelProcessModel; -import com.ruoyi.ruleEngine.client.model.process.DataSetProcessModel; -import com.ruoyi.ruleEngine.client.model.process.RecordProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.DataSetModel; +import com.ruoyi.ruleEngine.client.engine.model.RecordModel; +import com.ruoyi.ruleEngine.client.engine.model.process.DataModelProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.process.DataSetProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.process.RecordProcessModel; +import com.ruoyi.ruleEngine.client.service.RuleEngineService; import com.ruoyi.ruleEngine.remote.RemoteRuleEngineService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -40,7 +40,7 @@ import java.util.Objects; public class EngineOperationServiceImpl implements EngineOperationService { @Autowired - private RuleEngineVersionFactory ruleEngineVersionFactory; + private RuleEngineService ruleEngineService; @Autowired private RemoteRuleEngineService remoteRuleEngineService; @@ -75,7 +75,7 @@ public class EngineOperationServiceImpl implements EngineOperationService { } StringBuffer actionRecords=null; // 获取版本对应class文件的字节数组 - Map bytecode = ruleEngineVersionFactory.get(testDataReq.getVersionId()); + Map bytecode = ruleEngineService.get(testDataReq.getVersionId()); try { //执行引擎 actionRecords=this.engineExecute(bytecode,testDataReq.getVersionClass(), testDataReq.getVersionId()); diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/config/RuleEngineApplicationRunner.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/config/RuleEngineApplicationRunner.java index 5f0a20e..870d831 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/config/RuleEngineApplicationRunner.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/config/RuleEngineApplicationRunner.java @@ -1,18 +1,15 @@ package com.ruoyi.ruleEngine.client.config; import com.ruoyi.common.core.domain.Result; -import com.ruoyi.ruleEngine.client.util.RuleEngineUtil; -import com.ruoyi.ruleEngine.constant.RuleOperationConstants; +import com.ruoyi.ruleEngine.client.service.RuleEngineService; import com.ruoyi.ruleEngine.domain.EngineVersion; import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq; -import com.ruoyi.ruleEngine.client.dynamicLoad.DynamicLoader; import com.ruoyi.ruleEngine.remote.RemoteRuleEngineService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import java.util.List; -import java.util.Map; /** * 规则引擎应用程序运行程序 @@ -27,18 +24,13 @@ public class RuleEngineApplicationRunner implements ApplicationRunner { private RemoteRuleEngineService remoteRuleEngineService; @Autowired - private RuleEngineVersionFactory ruleEngineVersionFactory; + private RuleEngineService ruleEngineService; @Override - public void run(ApplicationArguments args) throws Exception { + public void run(ApplicationArguments args) { Result> result = remoteRuleEngineService.list(new EngineVersionQueryReq()); if(Result.isSuccess(result)){ - result.getData().forEach(engineVersion -> { - // 编译规则内容 - Map bytecode = RuleEngineUtil.compileVersion(engineVersion); - // 存入工厂 - ruleEngineVersionFactory.put(engineVersion.getId(), bytecode); - }); + ruleEngineService.init(result.getData()); } } } diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/config/RuleEngineVersionClientConfig.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/config/RuleEngineVersionClientConfig.java new file mode 100644 index 0000000..2a9476b --- /dev/null +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/config/RuleEngineVersionClientConfig.java @@ -0,0 +1,16 @@ +package com.ruoyi.ruleEngine.client.config; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; + +/** + * 规则引擎版本客户端配置 + * @ClassName RuleEngineVersionFactory + * @Author 森静若林 + * @Date 2024/5/8 19:31 + */ +@ComponentScan +@Import(RuleEngineApplicationRunner.class) +public class RuleEngineVersionClientConfig { + +} diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/config/RuleEngineVersionFactory.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/config/RuleEngineVersionFactory.java deleted file mode 100644 index cb7dea9..0000000 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/config/RuleEngineVersionFactory.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ruoyi.ruleEngine.client.config; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Import; -import java.util.HashMap; -import java.util.Map; - -/** - * 规则引擎版本工厂 - * @ClassName RuleEngineVersionFactory - * @Author 森静若林 - * @Date 2024/5/8 19:31 - */ -@ComponentScan -@Import(RuleEngineApplicationRunner.class) -public class RuleEngineVersionFactory { - private final Map> versionContentMap=new HashMap<>(); - - public Map> getMap() { - return this.versionContentMap; - } - - public void put(Long id,Map map) { - this.versionContentMap.put(id,map); - } - - public Map get(Long id) { - return this.versionContentMap.get(id); - } -} diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/RuleEngineContextHolder.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/RuleEngineContextHolder.java new file mode 100644 index 0000000..1a22d17 --- /dev/null +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/RuleEngineContextHolder.java @@ -0,0 +1,48 @@ +package com.ruoyi.ruleEngine.client.context; + +import org.springframework.stereotype.Component; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 规则引擎上下文 + * @ClassName RuleEngineContextHolder + * @Author GuanTieLin + * @Date 2024/5/15 20:37 + */ +@Component +public class RuleEngineContextHolder { + + /** + * 存储容器 + */ + private final Map> versionContentMap=new ConcurrentHashMap<>(16); + + /** + * 判断key是否存在 + */ + public boolean hasKey(Long id){ + return versionContentMap.containsKey(id); + } + + /** + * 新增编译文件数据 + */ + public void put(Long id,Map map) { + this.versionContentMap.put(id,map); + } + + /** + * 获取编译文件数据 + */ + public Map get(Long id) { + return this.versionContentMap.get(id); + } + + /** + * 删除编译文件数据 + */ + public void remove(Long id) { + this.versionContentMap.remove(id); + } +} diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/action/ActionRemove.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/action/ActionRemove.java index 99840b8..fcef83f 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/action/ActionRemove.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/action/ActionRemove.java @@ -1,6 +1,6 @@ package com.ruoyi.ruleEngine.client.engine.action; -import com.ruoyi.ruleEngine.client.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; import lombok.Getter; import lombok.Setter; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/action/ActionReplace.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/action/ActionReplace.java index 1e99d84..0f5825d 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/action/ActionReplace.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/action/ActionReplace.java @@ -1,6 +1,6 @@ package com.ruoyi.ruleEngine.client.engine.action; -import com.ruoyi.ruleEngine.client.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; import lombok.*; /** diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/DataModelContextHolder.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/DataModelContextHolder.java similarity index 89% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/DataModelContextHolder.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/DataModelContextHolder.java index a169d73..a1085d9 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/DataModelContextHolder.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/DataModelContextHolder.java @@ -1,10 +1,9 @@ -package com.ruoyi.ruleEngine.client.context; +package com.ruoyi.ruleEngine.client.engine.context; -import com.ruoyi.ruleEngine.client.model.process.DataModelProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.process.DataModelProcessModel; import com.ruoyi.ruleEngine.client.util.RuleEngineUtil; import lombok.Data; import lombok.experimental.SuperBuilder; - import java.sql.Connection; /** diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/DataSetContextHolder.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/DataSetContextHolder.java similarity index 86% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/DataSetContextHolder.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/DataSetContextHolder.java index 0c9c036..4877811 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/DataSetContextHolder.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/DataSetContextHolder.java @@ -1,6 +1,6 @@ -package com.ruoyi.ruleEngine.client.context; +package com.ruoyi.ruleEngine.client.engine.context; -import com.ruoyi.ruleEngine.client.model.process.DataSetProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.process.DataSetProcessModel; import lombok.Data; import lombok.experimental.SuperBuilder; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/RecordContextHolder.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/RecordContextHolder.java similarity index 87% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/RecordContextHolder.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/RecordContextHolder.java index 6abcdda..47ee5cf 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/RecordContextHolder.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/RecordContextHolder.java @@ -1,6 +1,6 @@ -package com.ruoyi.ruleEngine.client.context; +package com.ruoyi.ruleEngine.client.engine.context; -import com.ruoyi.ruleEngine.client.model.process.RecordProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.process.RecordProcessModel; import lombok.Data; import lombok.experimental.SuperBuilder; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/TaskContextHolder.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/TaskContextHolder.java similarity index 80% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/TaskContextHolder.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/TaskContextHolder.java index bc7d488..2853320 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/context/TaskContextHolder.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/context/TaskContextHolder.java @@ -1,4 +1,4 @@ -package com.ruoyi.ruleEngine.client.context; +package com.ruoyi.ruleEngine.client.engine.context; /** * 任务上下文 diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/DataModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/DataModel.java similarity index 92% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/DataModel.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/DataModel.java index fc969f4..030b664 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/DataModel.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/DataModel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ruleEngine.client.model; +package com.ruoyi.ruleEngine.client.engine.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/DataSetModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/DataSetModel.java similarity index 87% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/DataSetModel.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/DataSetModel.java index 2a5b313..dd8fdc4 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/DataSetModel.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/DataSetModel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ruleEngine.client.model; +package com.ruoyi.ruleEngine.client.engine.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/RecordModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/RecordModel.java similarity index 86% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/RecordModel.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/RecordModel.java index fca0140..aca7754 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/RecordModel.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/RecordModel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ruleEngine.client.model; +package com.ruoyi.ruleEngine.client.engine.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/process/DataModelProcessModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/process/DataModelProcessModel.java similarity index 73% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/process/DataModelProcessModel.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/process/DataModelProcessModel.java index 37d5ba9..8937541 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/process/DataModelProcessModel.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/process/DataModelProcessModel.java @@ -1,6 +1,6 @@ -package com.ruoyi.ruleEngine.client.model.process; +package com.ruoyi.ruleEngine.client.engine.model.process; -import com.ruoyi.ruleEngine.client.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/process/DataSetProcessModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/process/DataSetProcessModel.java similarity index 73% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/process/DataSetProcessModel.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/process/DataSetProcessModel.java index f5be966..4bd39ec 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/process/DataSetProcessModel.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/process/DataSetProcessModel.java @@ -1,6 +1,6 @@ -package com.ruoyi.ruleEngine.client.model.process; +package com.ruoyi.ruleEngine.client.engine.model.process; -import com.ruoyi.ruleEngine.client.model.DataSetModel; +import com.ruoyi.ruleEngine.client.engine.model.DataSetModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/process/RecordProcessModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/process/RecordProcessModel.java similarity index 75% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/process/RecordProcessModel.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/process/RecordProcessModel.java index c0b2e87..f5f1e78 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/model/process/RecordProcessModel.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/model/process/RecordProcessModel.java @@ -1,6 +1,6 @@ -package com.ruoyi.ruleEngine.client.model.process; +package com.ruoyi.ruleEngine.client.engine.model.process; -import com.ruoyi.ruleEngine.client.model.RecordModel; +import com.ruoyi.ruleEngine.client.engine.model.RecordModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/DataModelEngine.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/DataModelEngine.java index 0958eea..6c07067 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/DataModelEngine.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/DataModelEngine.java @@ -1,9 +1,9 @@ package com.ruoyi.ruleEngine.client.engine.scope; -import com.ruoyi.ruleEngine.client.context.DataModelContextHolder; +import com.ruoyi.ruleEngine.client.engine.context.DataModelContextHolder; import com.ruoyi.ruleEngine.client.engine.Engine; -import com.ruoyi.ruleEngine.client.model.DataModel; -import com.ruoyi.ruleEngine.client.model.process.DataModelProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.process.DataModelProcessModel; /** * 数据模型引擎 diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/DataSetEngine.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/DataSetEngine.java index 7f1c7ef..f5cc3fe 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/DataSetEngine.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/DataSetEngine.java @@ -1,10 +1,10 @@ package com.ruoyi.ruleEngine.client.engine.scope; -import com.ruoyi.ruleEngine.client.context.DataSetContextHolder; +import com.ruoyi.ruleEngine.client.engine.context.DataSetContextHolder; import com.ruoyi.ruleEngine.client.engine.Engine; -import com.ruoyi.ruleEngine.client.model.DataSetModel; -import com.ruoyi.ruleEngine.client.model.RecordModel; -import com.ruoyi.ruleEngine.client.model.process.DataSetProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.DataSetModel; +import com.ruoyi.ruleEngine.client.engine.model.RecordModel; +import com.ruoyi.ruleEngine.client.engine.model.process.DataSetProcessModel; import java.util.List; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/RecordEngine.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/RecordEngine.java index 06274c2..71767b0 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/RecordEngine.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/engine/scope/RecordEngine.java @@ -1,10 +1,10 @@ package com.ruoyi.ruleEngine.client.engine.scope; -import com.ruoyi.ruleEngine.client.context.RecordContextHolder; +import com.ruoyi.ruleEngine.client.engine.context.RecordContextHolder; import com.ruoyi.ruleEngine.client.engine.Engine; -import com.ruoyi.ruleEngine.client.model.DataModel; -import com.ruoyi.ruleEngine.client.model.RecordModel; -import com.ruoyi.ruleEngine.client.model.process.RecordProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.RecordModel; +import com.ruoyi.ruleEngine.client.engine.model.process.RecordProcessModel; import java.util.List; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/service/RuleEngineService.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/service/RuleEngineService.java new file mode 100644 index 0000000..c42f7bc --- /dev/null +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/service/RuleEngineService.java @@ -0,0 +1,81 @@ +package com.ruoyi.ruleEngine.client.service; + +import com.ruoyi.ruleEngine.client.context.RuleEngineContextHolder; +import com.ruoyi.ruleEngine.client.util.RuleEngineUtil; +import com.ruoyi.ruleEngine.domain.EngineVersion; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 规则引擎服务 + * @ClassName RuleEngineService + * @Author GuanTieLin + * @Date 2024/5/15 20:36 + */ +@Log4j2 +@Component +public class RuleEngineService { + + @Autowired + private RuleEngineContextHolder ruleEngineContextHolder; + + /** + * 初始化规则引擎上下文 + * @param engineVersionList 引擎版本集合 + */ + public void init(List engineVersionList){ + engineVersionList.forEach(this::put); + } + + /** + * 新增编译文件数据 + * @param engineVersion 引擎版本 + */ + public void put(EngineVersion engineVersion){ + // 编译规则内容 + Map bytecode = RuleEngineUtil.compileVersion(engineVersion); + // 存入上下文 + ruleEngineContextHolder.put(engineVersion.getId(), bytecode); + } + + /** + * 删除编译文件数据 + * @param id 引擎版本编号 + */ + public void remove(Long id){ + if(hasKey(id)){ + ruleEngineContextHolder.remove(id); + }else { + log.error("引擎上下文中不存在key:[{}]",id); + } + } + + /** + * 获取编译文件数据 + * @param id 引擎版本编号 + * @return 编译文件数据 + */ + public Map get(Long id){ + Map map=new HashMap<>(); + if(hasKey(id)){ + map=ruleEngineContextHolder.get(id); + }else { + log.error("引擎上下文中不存在key:[{}]",id); + } + return map; + } + + /** + * 判断key是否存在 + * @param id 引擎版本编号 + * @return 是否 + */ + public boolean hasKey(Long id){ + return ruleEngineContextHolder.hasKey(id); + } + +} diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/util/RuleEngineUtil.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/util/RuleEngineUtil.java index ca9ecab..cfebdf5 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/util/RuleEngineUtil.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/ruleEngine/client/util/RuleEngineUtil.java @@ -1,11 +1,11 @@ package com.ruoyi.ruleEngine.client.util; -import com.ruoyi.ruleEngine.client.context.DataSetContextHolder; +import com.ruoyi.ruleEngine.client.engine.context.DataSetContextHolder; import com.ruoyi.ruleEngine.client.dynamicLoad.DynamicLoader; -import com.ruoyi.ruleEngine.client.model.DataModel; -import com.ruoyi.ruleEngine.client.model.DataSetModel; -import com.ruoyi.ruleEngine.client.model.RecordModel; -import com.ruoyi.ruleEngine.client.model.process.DataSetProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.DataModel; +import com.ruoyi.ruleEngine.client.engine.model.DataSetModel; +import com.ruoyi.ruleEngine.client.engine.model.RecordModel; +import com.ruoyi.ruleEngine.client.engine.model.process.DataSetProcessModel; import com.ruoyi.ruleEngine.constant.RuleOperationConstants; import com.ruoyi.ruleEngine.domain.EngineVersion; import java.sql.*; @@ -56,6 +56,11 @@ public class RuleEngineUtil { DataSetContextHolder.set(dataSetProcessModel); } + /** + * 编译版本内容 + * @param engineVersion 引擎版本 + * @return class文件字节数组 + */ public static Map compileVersion(EngineVersion engineVersion){ // 获取版本内容 String content = engineVersion.getRuleContent().replaceAll("\r\n", ""); diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5740293..4542930 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,3 @@ -com.ruoyi.ruleEngine.client.config.RuleEngineVersionFactory +com.ruoyi.ruleEngine.client.config.RuleEngineVersionClientConfig +com.ruoyi.ruleEngine.client.context.RuleEngineContextHolder +com.ruoyi.ruleEngine.client.service.RuleEngineService diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/DataModelContextHolder.txt b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/DataModelContextHolder.txt index 184d4b9..1cfb250 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/DataModelContextHolder.txt +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/DataModelContextHolder.txt @@ -1,10 +1,9 @@ -package com.ruoyi.ruleEngine.client.context; +package com.ruoyi.ruleEngine.client.engine.context; -import com.ruoyi.ruleEngine.client.model.process.DataModelProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.process.DataModelProcessModel; import com.ruoyi.ruleEngine.client.util.RuleEngineUtil; import lombok.Data; import lombok.experimental.SuperBuilder; - import java.sql.Connection; /** diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/DataSetContextHolder.txt b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/DataSetContextHolder.txt index 0c9c036..4877811 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/DataSetContextHolder.txt +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/DataSetContextHolder.txt @@ -1,6 +1,6 @@ -package com.ruoyi.ruleEngine.client.context; +package com.ruoyi.ruleEngine.client.engine.context; -import com.ruoyi.ruleEngine.client.model.process.DataSetProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.process.DataSetProcessModel; import lombok.Data; import lombok.experimental.SuperBuilder; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/RecordContextHolder.txt b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/RecordContextHolder.txt index 6abcdda..47ee5cf 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/RecordContextHolder.txt +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/RecordContextHolder.txt @@ -1,6 +1,6 @@ -package com.ruoyi.ruleEngine.client.context; +package com.ruoyi.ruleEngine.client.engine.context; -import com.ruoyi.ruleEngine.client.model.process.RecordProcessModel; +import com.ruoyi.ruleEngine.client.engine.model.process.RecordProcessModel; import lombok.Data; import lombok.experimental.SuperBuilder; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/TaskContextHolder.txt b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/TaskContextHolder.txt index bc7d488..2853320 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/TaskContextHolder.txt +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/file/TaskContextHolder.txt @@ -1,4 +1,4 @@ -package com.ruoyi.ruleEngine.client.context; +package com.ruoyi.ruleEngine.client.engine.context; /** * 任务上下文