diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index 5721beb..d16aaf9 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java @@ -29,5 +29,5 @@ public class ServiceNameConstants { /** * 数据接入服务的serviceid */ - public static final String DATA_ACCESS_SERVICE = "muyu-etl"; + public static final String DATA_ACCESS_SERVICE = "muyu-data-access"; } diff --git a/muyu-modules/muyu-data-access/muyu-data-access-client/src/main/java/com/muyu/etl/config/DataAccessClientRunner.java b/muyu-modules/muyu-data-access/muyu-data-access-client/src/main/java/com/muyu/etl/config/DataAccessClientRunner.java index e9b6bd9..3fc879c 100644 --- a/muyu-modules/muyu-data-access/muyu-data-access-client/src/main/java/com/muyu/etl/config/DataAccessClientRunner.java +++ b/muyu-modules/muyu-data-access/muyu-data-access-client/src/main/java/com/muyu/etl/config/DataAccessClientRunner.java @@ -42,4 +42,5 @@ public class DataAccessClientRunner implements ApplicationRunner { MyDataSource.addBack(con); MyDataSource.size(key); } + } diff --git a/muyu-modules/muyu-data-access/muyu-data-access-common/src/main/java/com/muyu/etl/datasource/MyDataSource.java b/muyu-modules/muyu-data-access/muyu-data-access-common/src/main/java/com/muyu/etl/datasource/MyDataSource.java index e9b7242..cd9dbae 100644 --- a/muyu-modules/muyu-data-access/muyu-data-access-common/src/main/java/com/muyu/etl/datasource/MyDataSource.java +++ b/muyu-modules/muyu-data-access/muyu-data-access-common/src/main/java/com/muyu/etl/datasource/MyDataSource.java @@ -18,12 +18,13 @@ import java.util.logging.Logger; /** * @ClassName MyDataSource * @Description 数据库连接池管理 - * @Author Xin.Yao + * @Author Peng.Jiang * @Date 2024/5/9 19:36 */ @Component @Log4j2 public class MyDataSource { + private static HashMap pools = new HashMap<>(); /** @@ -40,7 +41,7 @@ public class MyDataSource { druidSource.setUrl(jdbcUrl); druidSource.setUsername(dataSource.getUsername()); druidSource.setPassword(dataSource.getPassword()); - // 配置连接池大小 + // 配置连接池大小 测试数据的展示 druidSource.setInitialSize(Integer.valueOf(dataSource.getInitNum().toString())); druidSource.setMinIdle(5); druidSource.setMaxActive(Integer.valueOf(dataSource.getMaxNum().toString())); @@ -102,7 +103,6 @@ public class MyDataSource { for (String s : pools.keySet()) { log.info("连接池名称: "+s); } - //根据key获取连接池 DruidDataSource druidDataSource = pools.get(key); //获取正在使用的连接数量 diff --git a/muyu-modules/muyu-data-access/muyu-data-access-remote/pom.xml b/muyu-modules/muyu-data-access/muyu-data-access-remote/pom.xml index d9a1b03..08fac9a 100644 --- a/muyu-modules/muyu-data-access/muyu-data-access-remote/pom.xml +++ b/muyu-modules/muyu-data-access/muyu-data-access-remote/pom.xml @@ -29,72 +29,5 @@ muyu-common-core - - - org.postgresql - postgresql - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - muyu-common-datasource - - - - - com.muyu - muyu-common-datascope - - - - - com.muyu - muyu-common-log - - - - - com.muyu - muyu-common-swagger - - diff --git a/muyu-modules/muyu-data-access/muyu-data-access-server/pom.xml b/muyu-modules/muyu-data-access/muyu-data-access-server/pom.xml index c3fdd2d..1a623e1 100644 --- a/muyu-modules/muyu-data-access/muyu-data-access-server/pom.xml +++ b/muyu-modules/muyu-data-access/muyu-data-access-server/pom.xml @@ -24,17 +24,7 @@ 3.6.3 - - com.muyu - muyu-engine-common - 3.6.3 - - - com.muyu - muyu-data-access-client - 3.6.3 - com.muyu diff --git a/muyu-modules/muyu-data-unit/pom.xml b/muyu-modules/muyu-data-unit/pom.xml index b1b8c4c..cadeee9 100644 --- a/muyu-modules/muyu-data-unit/pom.xml +++ b/muyu-modules/muyu-data-unit/pom.xml @@ -18,11 +18,6 @@ - - com.muyu - muyu-data-access-client - 3.6.3 - com.muyu diff --git a/muyu-modules/muyu-data-unit/src/main/java/com/muyu/data/unit/TestClass.java b/muyu-modules/muyu-data-unit/src/main/java/com/muyu/data/unit/TestClass.java new file mode 100644 index 0000000..7ee4576 --- /dev/null +++ b/muyu-modules/muyu-data-unit/src/main/java/com/muyu/data/unit/TestClass.java @@ -0,0 +1,25 @@ +package com.muyu.data.unit; + +import com.muyu.rule.model.DataModel; +import com.muyu.rule.scope.DataModelContext; +import com.muyu.rule.scope.model.DataProcessModel; +import org.springframework.stereotype.Component; + +@Component +public class TestClass { + + public static void main(String[] args) { + DataModel dataModel = new DataModel(); + dataModel.setValue("测试"); + dataModel.setKey("string"); + dataModel.setSourceType("varchar"); + dataModel.setProcessType("string"); + dataModel.setProcessClass(String.class); + DataProcessModel dataProcessModel = new DataProcessModel(); + dataProcessModel.setDataModel(dataModel); + DataModelContext.set(dataProcessModel); + TestConstant testConstant = new TestConstant(); + testConstant.execution(); + } + +} diff --git a/muyu-modules/muyu-data-unit/src/main/java/com/muyu/data/unit/TestConstant.java b/muyu-modules/muyu-data-unit/src/main/java/com/muyu/data/unit/TestConstant.java new file mode 100644 index 0000000..3633a3c --- /dev/null +++ b/muyu-modules/muyu-data-unit/src/main/java/com/muyu/data/unit/TestConstant.java @@ -0,0 +1,14 @@ +package com.muyu.data.unit; + +import com.muyu.rule.engine.scope.DataModelEngine; +import lombok.extern.log4j.Log4j2; + +@Log4j2 +public class TestConstant extends DataModelEngine { + @Override + public void execution() { + Object value = getValue(); + log.info("value",value); + } + +} diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/req/DataSourceAssetModelReq.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/req/DataSourceAssetModelReq.java index 28de642..3799641 100644 --- a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/req/DataSourceAssetModelReq.java +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/req/DataSourceAssetModelReq.java @@ -1,10 +1,10 @@ package com.muyu.rule.engine.req; import com.muyu.etl.domain.DataAsset; +import com.muyu.etl.domain.DataSource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.poi.poifs.nio.DataSource; @Data @AllArgsConstructor diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/req/TestInterfaceReq.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/req/TestInterfaceReq.java new file mode 100644 index 0000000..90d6ee3 --- /dev/null +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/req/TestInterfaceReq.java @@ -0,0 +1,25 @@ +package com.muyu.rule.engine.req; + +import com.muyu.etl.domain.AssetModel; +import com.muyu.rule.engine.domain.EngineVersion; +import com.muyu.rule.scope.model.DataProcessModel; +import com.muyu.rule.scope.model.DataSetProcessModel; +import com.muyu.rule.scope.model.RecordProcessModel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TestInterfaceReq { + + private DataProcessModel dataProcessModel; + private RecordProcessModel recordProcessModel; + private DataSetProcessModel dataSetProcessModel; + private EngineVersion engineVersion; + private List assetModelListl; + +} diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/DataModelEngine.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/DataModelEngine.java index cc068bf..46c8ef0 100644 --- a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/DataModelEngine.java +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/DataModelEngine.java @@ -14,29 +14,29 @@ public abstract class DataModelEngine implements Engine { return dataModelContext.get(); } - public DataModel getModel(){ + public DataModel getDataModel(){ return get().getDataModel(); } public String getKey () { - return getModel().getKey(); + return getDataModel().getKey(); } public Object getValue () { - return getModel().getValue(); + return getDataModel().getValue(); } public String getSourceType () { - return getModel().getSourceType(); + return getDataModel().getSourceType(); } public String getProcessType () { - return getModel().getProcessType(); + return getDataModel().getProcessType(); } public Class getProcessClass () { - return getModel().getProcessClass(); + return getDataModel().getProcessClass(); } } diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/DataSetEngine.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/DataSetEngine.java index 333862e..d98227d 100644 --- a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/DataSetEngine.java +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/DataSetEngine.java @@ -2,6 +2,7 @@ package com.muyu.rule.engine.scope; import com.muyu.rule.engine.Engine; import com.muyu.rule.model.DataSetModel; +import com.muyu.rule.model.RecordModel; import com.muyu.rule.scope.DataSetContext; import com.muyu.rule.scope.model.DataSetProcessModel; @@ -16,11 +17,8 @@ public abstract class DataSetEngine implements Engine { return get().getDataSetModel(); } - public DataSetContext getDataSetContext() { - return dataSetContext; + public RecordModel[] getRecordModelArr(){ + return getDataSetModel().getRecordModelArr(); } - public void setDataSetContext(DataSetContext dataSetContext) { - this.dataSetContext = dataSetContext; - } } diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/RecordEngine.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/RecordEngine.java index 9e6f745..ab07fe4 100644 --- a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/RecordEngine.java +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/engine/scope/RecordEngine.java @@ -1,15 +1,32 @@ package com.muyu.rule.engine.scope; import com.muyu.rule.engine.Engine; +import com.muyu.rule.model.DataModel; +import com.muyu.rule.model.RecordModel; import com.muyu.rule.scope.RecordContext; import com.muyu.rule.scope.model.RecordProcessModel; +import lombok.Data; +@Data public abstract class RecordEngine implements Engine { + private RecordContext recordContext; @Override public RecordProcessModel get() { - return null; + return recordContext.get(); + } + + public RecordModel getRecordModel() { + return get().getRecordModel(); + } + + public String[] getKeys() { + return get().getKeys(); + } + + public DataModel[] getDataModelArr() { + return getRecordModel().getDataModelArr(); } } diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/DataSetModel.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/DataSetModel.java index 04281e1..c961f16 100644 --- a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/DataSetModel.java +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/DataSetModel.java @@ -1,5 +1,8 @@ package com.muyu.rule.model; +import lombok.Data; + +@Data public class DataSetModel { private RecordModel[] recordModelArr = null; @@ -7,7 +10,6 @@ public class DataSetModel { private DataSetModel(int recordModelLength){ recordModelArr = new RecordModel[recordModelLength]; } - private DataSetModel(RecordModel[] recordModelArr){ recordModelArr = recordModelArr; } diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/DataStandard.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/DataStandard.java index b6dddbb..7f8340f 100644 --- a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/DataStandard.java +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/DataStandard.java @@ -1,5 +1,5 @@ package com.muyu.rule.model; -public class DataStandard { +public interface DataStandard { } diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/RecordModel.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/RecordModel.java index 67df7b8..6835c5c 100644 --- a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/RecordModel.java +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/model/RecordModel.java @@ -8,7 +8,6 @@ public class RecordModel { private RecordModel(int dataModelLength){ this.dataModelArr = new DataModel[dataModelLength]; } - private RecordModel(DataModel[] dataModelArr){ this.dataModelArr = dataModelArr; } diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/DataModelContext.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/DataModelContext.java index e1242cf..5cfacb3 100644 --- a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/DataModelContext.java +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/DataModelContext.java @@ -1,31 +1,20 @@ package com.muyu.rule.scope; import com.muyu.rule.scope.model.DataProcessModel; -import org.springframework.stereotype.Component; -@Component -public class DataModelContext implements ScopeContext { +public class DataModelContext { private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>(); - private final RecordContext recordContext; - - public DataModelContext (RecordContext recordContext) { - this.recordContext = recordContext; - } - - @Override - public DataProcessModel get () { + public static DataProcessModel get () { return THREAD_LOCAL.get(); } - @Override - public void set(DataProcessModel dataProcessModel){ + public static void set (DataProcessModel dataProcessModel) { THREAD_LOCAL.set(dataProcessModel); } - @Override - public void clear(){ + public static void clear(){ THREAD_LOCAL.remove(); } diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/DataSetContext.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/DataSetContext.java index 21feed4..e7580f0 100644 --- a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/DataSetContext.java +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/DataSetContext.java @@ -1,8 +1,10 @@ package com.muyu.rule.scope; import com.muyu.rule.scope.model.DataSetProcessModel; +import org.springframework.stereotype.Component; -public class DataSetContext implements ScopeContext { +@Component +public class DataSetContext{ private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>(); @@ -12,18 +14,16 @@ public class DataSetContext implements ScopeContext { this.taskContext = taskContext; } - @Override - public DataSetProcessModel get() { + + public static DataSetProcessModel get() { return THREAD_LOCAL.get(); } - @Override - public void clear(){ + public static void clear() { THREAD_LOCAL.remove(); } - @Override - public void set(DataSetProcessModel dataSetProcessModel){ + public static void set(DataSetProcessModel dataSetProcessModel) { THREAD_LOCAL.set(dataSetProcessModel); } diff --git a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/RecordContext.java b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/RecordContext.java index 5090afd..54eed7e 100644 --- a/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/RecordContext.java +++ b/muyu-modules/muyu-engine/muyu-engine-common/src/main/java/com/muyu/rule/scope/RecordContext.java @@ -8,7 +8,7 @@ import com.muyu.rule.scope.model.RecordProcessModel; * @Description: 记录/资产模型 * @Version: 1.0 */ -public class RecordContext implements ScopeContext{ +public class RecordContext { private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>(); @@ -18,18 +18,18 @@ public class RecordContext implements ScopeContext{ this.dataSetContext = dataSetContext; } - @Override - public RecordProcessModel get() { + + public static RecordProcessModel get() { return THREAD_LOCAL.get(); } - @Override - public void clear() { + + public static void clear() { THREAD_LOCAL.remove(); } - @Override - public void set(RecordProcessModel recordProcessModel) { + + public static void set(RecordProcessModel recordProcessModel) { THREAD_LOCAL.set(recordProcessModel); } diff --git a/muyu-modules/muyu-engine/muyu-engine-server/pom.xml b/muyu-modules/muyu-engine/muyu-engine-server/pom.xml index 49331ee..12b6857 100644 --- a/muyu-modules/muyu-engine/muyu-engine-server/pom.xml +++ b/muyu-modules/muyu-engine/muyu-engine-server/pom.xml @@ -19,12 +19,6 @@ - - com.muyu - muyu-data-access-client - 3.6.3 - - com.muyu muyu-engine-common diff --git a/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/controller/EngineVersionController.java b/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/controller/EngineVersionController.java index 5e1ac00..5f8bd33 100644 --- a/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/controller/EngineVersionController.java +++ b/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/controller/EngineVersionController.java @@ -119,4 +119,10 @@ public class EngineVersionController extends BaseController { return toAjax(engineVersionService.deleteEngineVersionByIds(ids)); } + + @PostMapping("/TestRuleVersion") + public Result testRuleVersion(){ + return engineVersionService.testRuleVersion(); + } + } diff --git a/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/service/IEngineVersionService.java b/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/service/IEngineVersionService.java index 8fbd14d..b76026c 100644 --- a/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/service/IEngineVersionService.java +++ b/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/service/IEngineVersionService.java @@ -68,4 +68,6 @@ public interface IEngineVersionService Result getDataRegionList(DataSourceAssetModelReq dataSourceAssetModelReq); + Result testRuleVersion(); + } diff --git a/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/service/impl/EngineVersionServiceImpl.java b/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/service/impl/EngineVersionServiceImpl.java index 4a6d4c1..655111b 100644 --- a/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/service/impl/EngineVersionServiceImpl.java +++ b/muyu-modules/muyu-engine/muyu-engine-server/src/main/java/com/muyu/rule/engine/service/impl/EngineVersionServiceImpl.java @@ -121,14 +121,6 @@ public class EngineVersionServiceImpl implements IEngineVersionService @Override public Result generatedCode(EngineVersion engineVersion) { -// //根据引擎ID获取规则引擎信息 -// EngineMaintenance engineMaintenance = engineMaintenanceMapper.selectEngineMaintenanceById(engineVersion.getEngineMaintenanceId()); -// //生成规则版本类名 -// engineVersion.setVersionCode(engineMaintenance.getEngineCode()+"_"+engineVersion.getCode()); -// //生成规则版本代码 -// engineVersion.setCodeIng(GenerateConstant.generateConstant(engineMaintenance,engineVersion)); -// return Result.success(engineVersion); - //根据引擎ID获取规则引擎信息 EngineMaintenance engineMaintenance = engineMaintenanceMapper.selectEngineMaintenanceById(engineVersion.getEngineMaintenanceId()); //生成规则版本类名 engineVersion.setVersionCode(engineMaintenance.getEngineCode()+"-"+engineVersion.getCode()); @@ -226,4 +218,10 @@ public class EngineVersionServiceImpl implements IEngineVersionService } return Result.success(kvtList); } + + @Override + public Result testRuleVersion() { + return null; + } + }