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 d443477..9777b2b 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,6 +1,5 @@ package com.muyu.Engineclient; -import com.muyu.common.core.domain.Result; import com.muyu.domain.EngineVersion; import com.muyu.remote.RemoteVersionService; import lombok.extern.log4j.Log4j2; diff --git a/cloud-etl-common/pom.xml b/cloud-etl-common/pom.xml index 2f97eba..0ca2699 100644 --- a/cloud-etl-common/pom.xml +++ b/cloud-etl-common/pom.xml @@ -18,14 +18,17 @@ + com.muyu cloud-common-core + com.muyu cloud-common-security + com.aliyun.oss aliyun-sdk-oss 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 ed8eba2..41a88a7 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,12 +11,12 @@ import java.util.Date; @Component public class GenerateConstant { - public static final String DATA_FIELD = "DataEngineValueActuator"; - public static final String DATA_RECORD = "DataEngineRecordActuator"; - public static final String DATA_SET = "DataEngineSetActuator"; - public static final String ACTION_IMPORT = "import com.muyu.abstracts.DataValue;"; - public static final String SCOPE_IMPORT = "import com.muyu.engine.basic.abstracts."; - public static final String PACKAGE_PATH = "package com.muyu.generate;\n"; + public static final String DATA_FIELD = "DataEngineValueActuator"; + public static final String DATA_RECORD = "DataEngineRecordActuator"; + public static final String DATA_SET = "DataEngineSetActuator"; + public static final String ACTION_IMPORT = "import com.muyu.abstracts.DataValue;"; + public static final String SCOPE_IMPORT = "import com.muyu.engine.basic.abstracts."; + public static final String PACKAGE_PATH = "package com.muyu.generate;\n"; public static String getClassName(String versionCode) { String[] splits = versionCode.split("_"); diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/JavaClass.java b/cloud-etl-common/src/main/java/com/muyu/domain/JavaClass.java new file mode 100644 index 0000000..e41481b --- /dev/null +++ b/cloud-etl-common/src/main/java/com/muyu/domain/JavaClass.java @@ -0,0 +1,81 @@ +package com.muyu.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author:qdm + * @Package:com.muyu.domain + * @Project:cloud-etl-engine + * @name:JavaClass + * @Date:2024/9/3 19:04 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class JavaClass { + /** + * 主键 + */ + private Integer id; + /** + * 姓名 + */ + private String name; + /** + * 性别 + */ + private String sex; + /** + * 描述 + */ + private String desc; + /** + * 价格 + */ + private BigDecimal price; + /** + * 分数 + */ + private Double score; + /** + * 身份证 + */ + private String idCard; + /** + * 年龄 + */ + private Integer age; + /** + * 地址 + */ + private String address; + /** + * 邮箱 + */ + private String email; + /** + * 电话 + */ + private String phone; + /** + * 创建人 + */ + private Integer createBy; + /** + * 修改人 + */ + private Integer updateBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 修改时间 + */ + private Date updateTime; +} diff --git a/cloud-etl-server/pom.xml b/cloud-etl-server/pom.xml index cbdc405..46f0f3b 100644 --- a/cloud-etl-server/pom.xml +++ b/cloud-etl-server/pom.xml @@ -19,7 +19,6 @@ 1.0.0 - com.alibaba.cloud @@ -44,8 +43,7 @@ spring-boot-starter-actuator - - + com.aliyun.oss aliyun-sdk-oss @@ -57,6 +55,7 @@ jaxb-api 2.3.1 + javax.activation activation @@ -114,8 +113,6 @@ junit - - @@ -132,7 +129,6 @@ cloud-engine - org.springframework.boot diff --git a/cloud-etl-server/src/main/java/com/muyu/abstracts/DataValue.java b/cloud-etl-server/src/main/java/com/muyu/abstracts/DataValue.java index 4226cbc..a8da29c 100644 --- a/cloud-etl-server/src/main/java/com/muyu/abstracts/DataValue.java +++ b/cloud-etl-server/src/main/java/com/muyu/abstracts/DataValue.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public abstract class DataValue { +public abstract class DataValue { /** * 键 */ diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java index 42c3af8..1aca67d 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java @@ -97,7 +97,7 @@ public class EngIneController extends BaseController { @PutMapping("/getRuleEngineInfo/{id}") public Result getRuleEngineInfo(@PathVariable(name = "id") Long id) { //使用mabits-plus-plus的查询方法 -// engIneService.getRuleEngineInfo(id); +// engIneService.getRuleEngineInfo(id); EngineVersionListResp engineConfigListResp = engIneService.getRuleEngineInfo(id); return Result.success(engineConfigListResp); } @@ -209,15 +209,15 @@ public class EngIneController extends BaseController { * @return */ @PostMapping("/generate") - public EngineVersion generate(@RequestBody EngineVersion engineVersion) { - EngineMaintenance byId = engIneService.selectById(engineVersion.getId()); - byId.setName("generate" + "_" + byId.getEngineCode() + "_" + engineVersion.getVersionCode()); - engineVersion.setRuleContent(GenerateConstant.generateConstant(byId, engineVersion)); - return engineVersion; + public EngineVersion generate(@RequestBody EngineVersion engineVersion) { + EngineMaintenance byId = engIneService.selectById(engineVersion.getId()); + byId.setName("generate" + "_" + byId.getEngineCode() + "_" + engineVersion.getVersionCode()); + engineVersion.setRuleContent(GenerateConstant.generateConstant(byId, engineVersion)); + return engineVersion; } /** - * 通过id查询版本version信息 传入id 和 versionId + * 通过id查询版本version信息 */ @GetMapping("/findVersionById/{id}") public Result findVersionById(@PathVariable("id") Long id) { diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngineLevelController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngineLevelController.java index 0b8171f..5b017ae 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngineLevelController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngineLevelController.java @@ -1,13 +1,9 @@ package com.muyu.controller; -import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.domain.EngineLevelEntity; -import com.muyu.domain.EngineMaintenance; -import com.muyu.domain.EngineVersion; import com.muyu.domain.constants.Result; import com.muyu.service.EngineLevelService; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java index caff8be..6f0f128 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngineVersionController.java @@ -176,6 +176,7 @@ public class EngineVersionController extends BaseController { */ @PostMapping("/insertVersion") public boolean insertVersion(@RequestBody EngineVersion engineVersion) { + System.out.println("88888888888888888888888888888"+engineVersion.getRuleContent()); OssUpload.uploadFiles(engineVersion.getRuleContent(), engineVersion.getVersionCode()); engineVersion.setId(null); boolean insert = engineVersionService.insert(engineVersion); diff --git a/cloud-etl-server/src/main/java/com/muyu/engine/value/ENGINE_PHONE_TEST_V1.java b/cloud-etl-server/src/main/java/com/muyu/engine/value/ENGINE_PHONE_TEST_V1.java index 1c00dc1..c42856f 100644 --- a/cloud-etl-server/src/main/java/com/muyu/engine/value/ENGINE_PHONE_TEST_V1.java +++ b/cloud-etl-server/src/main/java/com/muyu/engine/value/ENGINE_PHONE_TEST_V1.java @@ -2,5 +2,4 @@ package com.muyu.engine.value; public class ENGINE_PHONE_TEST_V1 { - } diff --git a/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineDataSetHandler.java b/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineDataSetHandler.java index 351bf11..49557d8 100644 --- a/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineDataSetHandler.java +++ b/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineDataSetHandler.java @@ -4,9 +4,11 @@ import com.muyu.abstracts.DataValue; public class DataEngineDataSetHandler { - public static void set(DataValue[][] dataDescribe){DataEngineHandler.set(dataDescribe);} + public static void set(DataValue[][] dataDescribe) { + DataEngineHandler.set(dataDescribe); + } - public static DataValue[][] get(){ + public static DataValue[][] get() { return DataEngineHandler.get(); } diff --git a/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineHandler.java b/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineHandler.java index e2ded75..c75328f 100644 --- a/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineHandler.java +++ b/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineHandler.java @@ -2,27 +2,22 @@ package com.muyu.handler; public class DataEngineHandler { - private static final ThreadLocal dataEngineHandler = new ThreadLocal<>(); + private static final ThreadLocal dataEngineHandler = new ThreadLocal<>(); - public static void set(final Object handler){ + public static void set(final Object handler) { dataEngineHandler.set(handler); } - public static T get(){ + public static T get() { - return (T) dataEngineHandler.get(); + return (T) dataEngineHandler.get(); } -public static void remove(){ + public static void remove() { dataEngineHandler.remove(); -} - - - - - + } } diff --git a/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineRowHandler.java b/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineRowHandler.java index 0e9cef2..dd5a466 100644 --- a/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineRowHandler.java +++ b/cloud-etl-server/src/main/java/com/muyu/handler/DataEngineRowHandler.java @@ -4,9 +4,11 @@ import com.muyu.abstracts.DataValue; public class DataEngineRowHandler { - public static void set(DataValue[] dataDescribe){DataEngineHandler.set(dataDescribe);} + public static void set(DataValue[] dataDescribe) { + DataEngineHandler.set(dataDescribe); + } - public static DataValue[] get(){ + public static DataValue[] get() { return DataEngineHandler.get(); } diff --git a/cloud-etl-server/src/main/java/com/muyu/mapper/EngineMapper.java b/cloud-etl-server/src/main/java/com/muyu/mapper/EngineMapper.java index 22b6c9d..c064a17 100644 --- a/cloud-etl-server/src/main/java/com/muyu/mapper/EngineMapper.java +++ b/cloud-etl-server/src/main/java/com/muyu/mapper/EngineMapper.java @@ -2,7 +2,6 @@ package com.muyu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.EngineMaintenance; -import com.muyu.domain.EngineVersion; import com.muyu.req.EngineMaintenanceQueryReq; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/pom.xml b/pom.xml index 3c57c66..1af55e3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,11 @@ cloud-etl-remote cloud-etl-server + 17 17 true +