diff --git a/cloud-etl-client/src/main/java/com/muyu/Engineclient/RuleEngineClientRunner.java b/cloud-etl-client/src/main/java/com/muyu/Engineclient/RuleEngineClientRunner.java index 9777b2b..f07e28e 100644 --- a/cloud-etl-client/src/main/java/com/muyu/Engineclient/RuleEngineClientRunner.java +++ b/cloud-etl-client/src/main/java/com/muyu/Engineclient/RuleEngineClientRunner.java @@ -1,33 +1,33 @@ -package com.muyu.Engineclient; - -import com.muyu.domain.EngineVersion; -import com.muyu.remote.RemoteVersionService; -import lombok.extern.log4j.Log4j2; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Author:qdm - * @Package:com.muyu.Engineclient - * @Project:cloud-etl-engine - * @name:RuleEngineClientRunner - * @Date:2024/8/29 11:05 - */ -@Log4j2 -@Component -public class RuleEngineClientRunner implements ApplicationRunner { - @Autowired - private RemoteVersionService remoteVersionService; - - @Override - public void run(ApplicationArguments args) throws Exception { - com.muyu.domain.constants.Result> listResult = remoteVersionService.selectVersionList(); - log.info(listResult); - List engineVersionList = listResult.getData(); - RuleEngineInit.init(engineVersionList); - } -} +//package com.muyu.Engineclient; +// +//import com.muyu.domain.EngineVersion; +//import com.muyu.remote.RemoteVersionService; +//import lombok.extern.log4j.Log4j2; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.ApplicationArguments; +//import org.springframework.boot.ApplicationRunner; +//import org.springframework.stereotype.Component; +// +//import java.util.List; +// +///** +// * @Author:qdm +// * @Package:com.muyu.Engineclient +// * @Project:cloud-etl-engine +// * @name:RuleEngineClientRunner +// * @Date:2024/8/29 11:05 +// */ +//@Log4j2 +//@Component +//public class RuleEngineClientRunner implements ApplicationRunner { +// @Autowired +// private RemoteVersionService remoteVersionService; +// +// @Override +// public void run(ApplicationArguments args) throws Exception { +// com.muyu.domain.constants.Result> listResult = remoteVersionService.selectVersionList(); +// log.info(listResult); +// List engineVersionList = listResult.getData(); +// RuleEngineInit.init(engineVersionList); +// } +//} diff --git a/cloud-etl-client/src/main/java/com/muyu/Engineclient/RuleEngineInit.java b/cloud-etl-client/src/main/java/com/muyu/Engineclient/RuleEngineInit.java index 67d0930..7cb176e 100644 --- a/cloud-etl-client/src/main/java/com/muyu/Engineclient/RuleEngineInit.java +++ b/cloud-etl-client/src/main/java/com/muyu/Engineclient/RuleEngineInit.java @@ -1,28 +1,28 @@ -package com.muyu.Engineclient; - -import com.muyu.domain.EngineVersion; -import com.muyu.domain.constants.RuleOperationConstants; -import com.muyu.dynamicLoad.DynamicLoader; -import org.springframework.stereotype.Component; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Component -public class RuleEngineInit { - private static Map> engineMap = new HashMap(); - - public static void init(List engineVersionList) { - engineVersionList.stream().forEach(engineVersion -> { - String content = engineVersion.getRuleContent().replaceAll("\r\n", ""); - Map bytecode = DynamicLoader.compile(engineVersion.getVersionClass() + - RuleOperationConstants.FILE_SUFFIX, content); - engineMap.put(engineVersion.getId(), bytecode); - }); - } - - public static Map getEngineMap(Long ruleId) { - return engineMap.get(ruleId); - } -} +//package com.muyu.Engineclient; +// +//import com.muyu.domain.EngineVersion; +//import com.muyu.domain.constants.RuleOperationConstants; +//import com.muyu.dynamicLoad.DynamicLoader; +//import org.springframework.stereotype.Component; +// +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +// +//@Component +//public class RuleEngineInit { +// private static Map> engineMap = new HashMap(); +// +// public static void init(List engineVersionList) { +// engineVersionList.stream().forEach(engineVersion -> { +// String content = engineVersion.getRuleContent().replaceAll("\r\n", ""); +// Map bytecode = DynamicLoader.compile(engineVersion.getVersionClass() + +// RuleOperationConstants.FILE_SUFFIX, content); +// engineMap.put(engineVersion.getId(), bytecode); +// }); +// } +// +// public static Map getEngineMap(Long ruleId) { +// return engineMap.get(ruleId); +// } +//} diff --git a/cloud-etl-client/src/main/java/com/muyu/config/EngineConfig.java b/cloud-etl-client/src/main/java/com/muyu/config/EngineConfig.java index 9d25497..520a2e0 100644 --- a/cloud-etl-client/src/main/java/com/muyu/config/EngineConfig.java +++ b/cloud-etl-client/src/main/java/com/muyu/config/EngineConfig.java @@ -1,89 +1,89 @@ -package com.muyu.config; - -import com.muyu.Engineclient.RuleEngineInit; -import com.muyu.common.core.domain.Result; -import com.muyu.context.DataModelContextHolder; -import com.muyu.context.DataSetContextHolder; -import com.muyu.context.RecordContextHolder; -import com.muyu.domain.EngineVersion; -import com.muyu.dynamicLoad.DynamicLoader; -import com.muyu.model.DataModel; -import com.muyu.model.DataSetModel; -import com.muyu.model.RecordModel; -import com.muyu.model.process.DataProcessModel; -import com.muyu.model.process.DataSetProcessModel; -import com.muyu.model.process.RecordProcessModel; -import com.muyu.remote.RemoteVersionService; -import com.muyu.req.EngineVersionTestReq; -import lombok.extern.log4j.Log4j2; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Import; -import org.springframework.stereotype.Component; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@Log4j2 -@ComponentScan -@Component -@Import(value = {RuleEngineClientRunner.class}) -public class EngineConfig { - - @Autowired - private RemoteVersionService remoteVersionService; - - public Result engineVersionTest(EngineVersionTestReq testReq) { - if (testReq.getScope() == 4) { - DataProcessModel dataProcessModel = DataProcessModel.builder().dataModel(testReq.getDataModel()).build(); - DataModelContextHolder.set(dataProcessModel); - } else if (testReq.getScope() == 3) { - RecordModel recordModel = RecordModel.builder().dataModels(testReq.getDataModelList()).build(); - RecordProcessModel recordProcessModel = RecordProcessModel.builder() - .keys(testReq.getKeys()) - .recordModel(recordModel) - .build(); - RecordContextHolder.set(recordProcessModel); - } else if (testReq.getScope() == 2) { - List recordModelList = new ArrayList<>(); - List> dataModelLists = testReq.getDataModelLists(); - dataModelLists.stream().forEach(dataModelList -> { - RecordModel recordModel = RecordModel.builder().dataModels(dataModelList).build(); - recordModelList.add(recordModel); - }); - DataSetModel dataSetModel = DataSetModel.builder() - .recordModels(recordModelList) - .build(); - DataSetProcessModel dataSetProcessModel = DataSetProcessModel.builder() - .dataSetModel(dataSetModel) - .build(); - DataSetContextHolder.set(dataSetProcessModel); - } - com.muyu.domain.constants.Result version = remoteVersionService.getVersion(testReq.getEngineVersionId()); - EngineVersion engineVersion = version.getData(); - Map engineMap = RuleEngineInit.getEngineMap(testReq.getEngineVersionId()); - - try { - @SuppressWarnings("resource") - DynamicLoader.MemoryClassLoader classLoader = new DynamicLoader.MemoryClassLoader(engineMap); - Class aClass = classLoader.loadClass(engineVersion.getVersionClass()); - Method method = aClass.getDeclaredMethod("execution"); - Object o = aClass.newInstance(); - method.invoke(o); - } catch (Exception e) { - log.info(e.getMessage()); - return Result.success("程序异常: 信息[" + e.getLocalizedMessage() + "]异常"); - } - return Result.success("测试正常,无异常数据返回"); - } - - public Object getLocation() { - return "没有信息"; - } - - public Object getPack() { - return null; - } -} +//package com.muyu.config; +// +//import com.muyu.Engineclient.RuleEngineInit; +//import com.muyu.common.core.domain.Result; +//import com.muyu.context.DataModelContextHolder; +//import com.muyu.context.DataSetContextHolder; +//import com.muyu.context.RecordContextHolder; +//import com.muyu.domain.EngineVersion; +//import com.muyu.dynamicLoad.DynamicLoader; +//import com.muyu.model.DataModel; +//import com.muyu.model.DataSetModel; +//import com.muyu.model.RecordModel; +//import com.muyu.model.process.DataProcessModel; +//import com.muyu.model.process.DataSetProcessModel; +//import com.muyu.model.process.RecordProcessModel; +//import com.muyu.remote.RemoteVersionService; +//import com.muyu.req.EngineVersionTestReq; +//import lombok.extern.log4j.Log4j2; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.context.annotation.ComponentScan; +//import org.springframework.context.annotation.Import; +//import org.springframework.stereotype.Component; +// +//import java.lang.reflect.Method; +//import java.util.ArrayList; +//import java.util.List; +//import java.util.Map; +// +//@Log4j2 +//@ComponentScan +//@Component +//@Import(value = {RuleEngineClientRunner.class}) +//public class EngineConfig { +// +// @Autowired +// private RemoteVersionService remoteVersionService; +// +// public Result engineVersionTest(EngineVersionTestReq testReq) { +// if (testReq.getScope() == 4) { +// DataProcessModel dataProcessModel = DataProcessModel.builder().dataModel(testReq.getDataModel()).build(); +// DataModelContextHolder.set(dataProcessModel); +// } else if (testReq.getScope() == 3) { +// RecordModel recordModel = RecordModel.builder().dataModels(testReq.getDataModelList()).build(); +// RecordProcessModel recordProcessModel = RecordProcessModel.builder() +// .keys(testReq.getKeys()) +// .recordModel(recordModel) +// .build(); +// RecordContextHolder.set(recordProcessModel); +// } else if (testReq.getScope() == 2) { +// List recordModelList = new ArrayList<>(); +// List> dataModelLists = testReq.getDataModelLists(); +// dataModelLists.stream().forEach(dataModelList -> { +// RecordModel recordModel = RecordModel.builder().dataModels(dataModelList).build(); +// recordModelList.add(recordModel); +// }); +// DataSetModel dataSetModel = DataSetModel.builder() +// .recordModels(recordModelList) +// .build(); +// DataSetProcessModel dataSetProcessModel = DataSetProcessModel.builder() +// .dataSetModel(dataSetModel) +// .build(); +// DataSetContextHolder.set(dataSetProcessModel); +// } +// com.muyu.domain.constants.Result version = remoteVersionService.getVersion(testReq.getEngineVersionId()); +// EngineVersion engineVersion = version.getData(); +// Map engineMap = RuleEngineInit.getEngineMap(testReq.getEngineVersionId()); +// +// try { +// @SuppressWarnings("resource") +// DynamicLoader.MemoryClassLoader classLoader = new DynamicLoader.MemoryClassLoader(engineMap); +// Class aClass = classLoader.loadClass(engineVersion.getVersionClass()); +// Method method = aClass.getDeclaredMethod("execution"); +// Object o = aClass.newInstance(); +// method.invoke(o); +// } catch (Exception e) { +// log.info(e.getMessage()); +// return Result.success("程序异常: 信息[" + e.getLocalizedMessage() + "]异常"); +// } +// return Result.success("测试正常,无异常数据返回"); +// } +// +// public Object getLocation() { +// return "没有信息"; +// } +// +// public Object getPack() { +// return null; +// } +//} diff --git a/cloud-etl-client/src/main/java/com/muyu/config/RuleEngineClientRunner.java b/cloud-etl-client/src/main/java/com/muyu/config/RuleEngineClientRunner.java index 9382f3c..31b7c0f 100644 --- a/cloud-etl-client/src/main/java/com/muyu/config/RuleEngineClientRunner.java +++ b/cloud-etl-client/src/main/java/com/muyu/config/RuleEngineClientRunner.java @@ -1,29 +1,29 @@ -package com.muyu.config; - -import com.muyu.Engineclient.RuleEngineInit; -import com.muyu.domain.EngineVersion; -import com.muyu.domain.constants.Result; -import com.muyu.remote.RemoteVersionService; -import lombok.extern.log4j.Log4j2; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -@Log4j2 -public class RuleEngineClientRunner implements ApplicationRunner { - - @Autowired - private RemoteVersionService remoteVersionService; - - @Override - public void run(ApplicationArguments args) throws Exception { - Result> listResult = remoteVersionService.selectVersionList(); - log.info(listResult); - List engineVersionList = listResult.getData(); - RuleEngineInit.init(engineVersionList); - } -} +//package com.muyu.config; +// +//import com.muyu.Engineclient.RuleEngineInit; +//import com.muyu.domain.EngineVersion; +//import com.muyu.domain.constants.Result; +//import com.muyu.remote.RemoteVersionService; +//import lombok.extern.log4j.Log4j2; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.ApplicationArguments; +//import org.springframework.boot.ApplicationRunner; +//import org.springframework.stereotype.Component; +// +//import java.util.List; +// +//@Component +//@Log4j2 +//public class RuleEngineClientRunner implements ApplicationRunner { +// +// @Autowired +// private RemoteVersionService remoteVersionService; +// +// @Override +// public void run(ApplicationArguments args) throws Exception { +// Result> listResult = remoteVersionService.selectVersionList(); +// log.info(listResult); +// List engineVersionList = listResult.getData(); +// RuleEngineInit.init(engineVersionList); +// } +//} diff --git a/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java b/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java index 9630ee8..a910da3 100644 --- a/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java +++ b/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java @@ -11,9 +11,6 @@ import java.util.Date; @Component public class GenerateConstant { - public static void main(String[] args) { - System.out.println("hello world"); - } public static final String DATA_FIELD = "DataEngineValueActuator"; public static final String DATA_RECORD = "DataEngineRecordActuator"; diff --git a/lib/com/muyu/calss/DataEngineValueActuatorww.class b/lib/com/muyu/calss/DataEngineValueActuatorww.class new file mode 100644 index 0000000..ccb7a67 Binary files /dev/null and b/lib/com/muyu/calss/DataEngineValueActuatorww.class differ