From 5f445dd0c55a83e69a26b8cc0fe9f1b8686fc650 Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Thu, 29 Aug 2024 21:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
cloud-etl-client/pom.xml | 27 +-
.../com/muyu/Engineclient/RuleEngineInit.java | 4 +-
.../muyu/config/RuleEngineClientRunner.java | 1 +
cloud-etl-common/pom.xml | 10 +-
.../muyu/context/DataModelContextHolder.java | 5 +-
.../muyu/context/DataSetContextHolder.java | 5 +-
.../com/muyu/context/RecordContextHolder.java | 5 +-
.../com/muyu/context/TaskContextHolder.java | 1 +
.../com/muyu/domain/EngineMaintenance.java | 70 +-
.../main/java/com/muyu/domain/EngineType.java | 8 +-
.../java/com/muyu/domain/EngineVersion.java | 49 +-
.../com/muyu/domain/constants/Constants.java | 2 +-
.../com/muyu/domain/constants/PageResult.java | 12 +-
.../domain/constants/RabbitMQConstants.java | 2 +-
.../muyu/domain/constants/TokenConstants.java | 2 +-
.../java/com/muyu/domain/model/TestData.java | 3 +-
.../com/muyu/dynamicLoad/DynamicLoader.java | 4 +-
.../dynamicLoad/MemoryJavaFileManager.java | 4 +-
.../main/java/com/muyu/model/DataModel.java | 1 +
.../model/process/RecordProcessModel.java | 1 -
.../muyu/req/EngineMaintenanceEditReq.java | 28 +-
.../muyu/req/EngineMaintenanceQueryReq.java | 28 +-
.../muyu/req/EngineMaintenanceSaveReq.java | 32 +-
.../com/muyu/req/EngineVersionEditReq.java | 38 +-
.../com/muyu/req/EngineVersionListResp.java | 36 +-
.../com/muyu/req/EngineVersionQueryReq.java | 24 +-
.../com/muyu/req/EngineVersionSaveReq.java | 44 +-
.../com/muyu/resp/EngineConfigScopeResp.java | 13 +-
.../com/muyu/resp/EngineVersionListResp.java | 37 +-
cloud-etl-server/pom.xml | 26 +-
.../com/muyu/controller/EngIneController.java | 5 +-
.../controller/EngineVersionController.java | 4 +-
.../java/com/muyu/controller/Student.java | 11 +-
.../main/java/com/muyu/controller/Test.java | 6 +-
.../serviceImpl/EngineVersionServiceImpl.java | 12 +-
.../service/serviceImpl/TypeServiceImpl.java | 10 +-
.../src/main/resources/logback/prod.xml | 3 +-
.../src/main/resources/logback/test.xml | 3 +-
.../resources/mapper/EnginLevelMapper.xml | 4 +-
.../resources/mapper/EngineVersionMapper.xml | 9 +-
.../muyu/base/hander/DataEngineHandler.java | 6 +-
.../muyu/base/hander/DataEngineValue.java | 8 +-
logs/cloud-etl-engine/error.log | 734 ++++++++++++++++++
logs/cloud-etl-engine/info.log | 154 ++++
44 files changed, 1291 insertions(+), 200 deletions(-)
diff --git a/cloud-etl-client/pom.xml b/cloud-etl-client/pom.xml
index 3d1f46a..aa68e09 100644
--- a/cloud-etl-client/pom.xml
+++ b/cloud-etl-client/pom.xml
@@ -11,20 +11,19 @@
cloud-etl-client
-
-
- com.muyu
- cloud-etl-common
- 1.0.0
-
-
- com.muyu
- cloud-etl-remote
- 1.0.0
- compile
-
-
-
+
+
+ com.muyu
+ cloud-etl-common
+ 1.0.0
+
+
+ com.muyu
+ cloud-etl-remote
+ 1.0.0
+ compile
+
+
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 1c76fa3..67d0930 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,8 +1,10 @@
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;
@@ -11,7 +13,7 @@ import java.util.Map;
public class RuleEngineInit {
private static Map> engineMap = new HashMap();
- public static void init(List engineVersionList){
+ public static void init(List engineVersionList) {
engineVersionList.stream().forEach(engineVersion -> {
String content = engineVersion.getRuleContent().replaceAll("\r\n", "");
Map bytecode = DynamicLoader.compile(engineVersion.getVersionClass() +
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 70d0e0a..9382f3c 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
@@ -11,6 +11,7 @@ import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
import java.util.List;
+
@Component
@Log4j2
public class RuleEngineClientRunner implements ApplicationRunner {
diff --git a/cloud-etl-common/pom.xml b/cloud-etl-common/pom.xml
index 716806c..06d0ea7 100644
--- a/cloud-etl-common/pom.xml
+++ b/cloud-etl-common/pom.xml
@@ -23,11 +23,11 @@
cloud-common-core
-
-
-
-
-
+
+
+
+
+
diff --git a/cloud-etl-common/src/main/java/com/muyu/context/DataModelContextHolder.java b/cloud-etl-common/src/main/java/com/muyu/context/DataModelContextHolder.java
index c2b58b8..1324eb5 100644
--- a/cloud-etl-common/src/main/java/com/muyu/context/DataModelContextHolder.java
+++ b/cloud-etl-common/src/main/java/com/muyu/context/DataModelContextHolder.java
@@ -6,17 +6,18 @@ import lombok.experimental.SuperBuilder;
/**
* 数据模型上下文
+ *
* @ClassName DataModelContextHolder
* @Author qdm
*/
@Data
@SuperBuilder
public class DataModelContextHolder {
- private static final ThreadLocal THREAD_LOCAL=new ThreadLocal<>();
+ private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>();
private RecordContextHolder recordContextHolder;
- public static DataModelContextHolder build(RecordContextHolder recordContextHolder){
+ public static DataModelContextHolder build(RecordContextHolder recordContextHolder) {
return DataModelContextHolder.builder()
.recordContextHolder(recordContextHolder)
.build();
diff --git a/cloud-etl-common/src/main/java/com/muyu/context/DataSetContextHolder.java b/cloud-etl-common/src/main/java/com/muyu/context/DataSetContextHolder.java
index 75042f0..5de7e20 100644
--- a/cloud-etl-common/src/main/java/com/muyu/context/DataSetContextHolder.java
+++ b/cloud-etl-common/src/main/java/com/muyu/context/DataSetContextHolder.java
@@ -6,6 +6,7 @@ import lombok.experimental.SuperBuilder;
/**
* 数据集上下文
+ *
* @ClassName DataSetContextHolder
* @Author qdm
* @Version: 1.0
@@ -13,11 +14,11 @@ import lombok.experimental.SuperBuilder;
@Data
@SuperBuilder
public class DataSetContextHolder {
- private static final ThreadLocal THREAD_LOCAL=new ThreadLocal<>();
+ private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>();
private TaskContextHolder taskContextHolder;
- public static DataSetContextHolder build(TaskContextHolder taskContextHolder){
+ public static DataSetContextHolder build(TaskContextHolder taskContextHolder) {
return DataSetContextHolder.builder()
.taskContextHolder(taskContextHolder)
.build();
diff --git a/cloud-etl-common/src/main/java/com/muyu/context/RecordContextHolder.java b/cloud-etl-common/src/main/java/com/muyu/context/RecordContextHolder.java
index 0857100..da55e81 100644
--- a/cloud-etl-common/src/main/java/com/muyu/context/RecordContextHolder.java
+++ b/cloud-etl-common/src/main/java/com/muyu/context/RecordContextHolder.java
@@ -6,6 +6,7 @@ import lombok.experimental.SuperBuilder;
/**
* 记录上下文
+ *
* @ClassName RecordContextHolder
* @Author qdm
* @Version: 1.0
@@ -13,11 +14,11 @@ import lombok.experimental.SuperBuilder;
@Data
@SuperBuilder
public class RecordContextHolder {
- private static final ThreadLocal THREAD_LOCAL=new ThreadLocal<>();
+ private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>();
private DataSetContextHolder dataSetContextHolder;
- public static RecordContextHolder build(DataSetContextHolder dataSetContextHolder){
+ public static RecordContextHolder build(DataSetContextHolder dataSetContextHolder) {
return RecordContextHolder.builder()
.dataSetContextHolder(dataSetContextHolder)
.build();
diff --git a/cloud-etl-common/src/main/java/com/muyu/context/TaskContextHolder.java b/cloud-etl-common/src/main/java/com/muyu/context/TaskContextHolder.java
index 918eaac..bf1f52b 100644
--- a/cloud-etl-common/src/main/java/com/muyu/context/TaskContextHolder.java
+++ b/cloud-etl-common/src/main/java/com/muyu/context/TaskContextHolder.java
@@ -2,6 +2,7 @@ package com.muyu.context;
/**
* 任务上下文
+ *
* @ClassName TaskContextHolder
* @Author qdm
* @Version: 1.0
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java b/cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java
index dfcc1bb..f6e6255 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java
@@ -33,44 +33,59 @@ public class EngineMaintenance extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 编号 */
- @TableId(value = "id",type = IdType.AUTO)
+ /**
+ * 编号
+ */
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
- /** 名称 */
+ /**
+ * 名称
+ */
@Excel(name = "名称")
private String name;
- /** 类型 */
+ /**
+ * 类型
+ */
@Excel(name = "类型")
private Integer type;
- /** 作用域 */
+ /**
+ * 作用域
+ */
@Excel(name = "作用域")
private Integer scope;
- /** 引擎编码 */
+ /**
+ * 引擎编码
+ */
@Excel(name = "引擎编码")
private String engineCode;
- /** 是否激活 */
+ /**
+ * 是否激活
+ */
@Excel(name = "是否激活")
private String isActivate;
- /** 状态 */
+ /**
+ * 状态
+ */
@Excel(name = "状态")
private String status;
- /** 描述 */
+ /**
+ * 描述
+ */
@Excel(name = "描述")
private String description;
-
/**
- * 查询构造器
- */
- public static EngineMaintenance queryBuild(EngineMaintenanceQueryReq engineMaintenanceQueryReq){
+ * 查询构造器
+ */
+ public static EngineMaintenance queryBuild(EngineMaintenanceQueryReq engineMaintenanceQueryReq) {
return EngineMaintenance.builder()
.name(engineMaintenanceQueryReq.getName())
.type(engineMaintenanceQueryReq.getType())
@@ -82,9 +97,9 @@ public class EngineMaintenance extends BaseEntity {
}
/**
- * 添加构造器
- */
- public static EngineMaintenance saveBuild(EngineMaintenanceSaveReq engineMaintenanceSaveReq, Supplier createBy){
+ * 添加构造器
+ */
+ public static EngineMaintenance saveBuild(EngineMaintenanceSaveReq engineMaintenanceSaveReq, Supplier createBy) {
return EngineMaintenance.builder()
.name(engineMaintenanceSaveReq.getName())
.type(engineMaintenanceSaveReq.getType())
@@ -94,17 +109,17 @@ public class EngineMaintenance extends BaseEntity {
.status(engineMaintenanceSaveReq.getStatus())
.description(engineMaintenanceSaveReq.getDescription())
.remark(engineMaintenanceSaveReq.getRemark())
- .createBy(createBy.get())
- .createTime(new Date())
- .build();
+ .createBy(createBy.get())
+ .createTime(new Date())
+ .build();
}
/**
- * 修改构造器
- */
- public static EngineMaintenance editBuild(Long id, EngineMaintenanceEditReq engineMaintenanceEditReq, Supplier updateBy){
+ * 修改构造器
+ */
+ public static EngineMaintenance editBuild(Long id, EngineMaintenanceEditReq engineMaintenanceEditReq, Supplier updateBy) {
return EngineMaintenance.builder()
- .id(id)
+ .id(id)
.name(engineMaintenanceEditReq.getName())
.type(engineMaintenanceEditReq.getType())
.scope(engineMaintenanceEditReq.getScope())
@@ -113,12 +128,13 @@ public class EngineMaintenance extends BaseEntity {
.status(engineMaintenanceEditReq.getStatus())
.description(engineMaintenanceEditReq.getDescription())
.remark(engineMaintenanceEditReq.getRemark())
- .updateBy(updateBy.get())
- .updateTime(new Date())
- .build();
+ .updateBy(updateBy.get())
+ .updateTime(new Date())
+ .build();
}
+
//EngineReq构造方法
- public static EngineReq engineReqBuild(EngineMaintenance engineMaintenance){
+ public static EngineReq engineReqBuild(EngineMaintenance engineMaintenance) {
return EngineReq.builder()
.id(engineMaintenance.getId())
.name(engineMaintenance.getName())
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/EngineType.java b/cloud-etl-common/src/main/java/com/muyu/domain/EngineType.java
index 19a827c..5689515 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/EngineType.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/EngineType.java
@@ -15,6 +15,12 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
public class EngineType {
+ /**
+ * 类型编号
+ */
private Integer id;
- private String name;
+ /**
+ * |类型名称
+ */
+ private String name;
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java b/cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java
index 3b32236..c53b12a 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java
@@ -14,6 +14,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
+
import java.util.Date;
import java.util.function.Supplier;
@@ -32,50 +33,70 @@ import java.util.function.Supplier;
public class EngineVersion extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 编号 */
- @TableId(value = "id",type = IdType.AUTO)
+ /**
+ * 编号
+ */
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
- /** 版本类名 */
+ /**
+ * 版本类名
+ */
@Excel(name = "版本类名")
private String versionClass;
- /** 版本名称 */
+ /**
+ * 版本名称
+ */
@Excel(name = "版本名称")
private String name;
- /** 版本编码 */
+ /**
+ * 版本编码
+ */
@Excel(name = "版本编码")
private String versionCode;
- /** 是否激活 */
+ /**
+ * 是否激活
+ */
@Excel(name = "是否激活")
private String isActivate;
- /** 版本状态 */
+ /**
+ * 版本状态
+ */
@Excel(name = "版本状态")
private Integer status;
- /** 版本测试状态 */
+ /**
+ * 版本测试状态
+ */
@Excel(name = "版本测试状态")
private Integer testStatus;
- /** 规则内容 */
+ /**
+ * 规则内容
+ */
@Excel(name = "规则内容")
private String ruleContent;
- /** 引擎维护编号 */
+ /**
+ * 引擎维护编号
+ */
@Excel(name = "引擎维护编号")
private Long engineMaintenanceId;
- /** 描述 */
+ /**
+ * 描述
+ */
@Excel(name = "描述")
private String description;
/**
* 查询构造器
*/
- public static EngineVersion queryBuild(EngineVersionQueryReq engineConfigQueryReq){
+ public static EngineVersion queryBuild(EngineVersionQueryReq engineConfigQueryReq) {
return EngineVersion.builder()
.versionCode(engineConfigQueryReq.getVersionCode())
.ruleContent(engineConfigQueryReq.getRuleContent())
@@ -86,7 +107,7 @@ public class EngineVersion extends BaseEntity {
/**
* 添加构造器
*/
- public static EngineVersion saveBuild(EngineVersionSaveReq engineConfigSaveReq, Supplier createBy){
+ public static EngineVersion saveBuild(EngineVersionSaveReq engineConfigSaveReq, Supplier createBy) {
return EngineVersion.builder()
.versionClass(engineConfigSaveReq.getVersionClass())
.name(engineConfigSaveReq.getName())
@@ -106,7 +127,7 @@ public class EngineVersion extends BaseEntity {
/**
* 修改构造器
*/
- public static EngineVersion editBuild(Long id, EngineVersionEditReq engineConfigEditReq, Supplier updateBy){
+ public static EngineVersion editBuild(Long id, EngineVersionEditReq engineConfigEditReq, Supplier updateBy) {
return EngineVersion.builder()
.id(id)
.versionClass(engineConfigEditReq.getVersionClass())
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/constants/Constants.java b/cloud-etl-common/src/main/java/com/muyu/domain/constants/Constants.java
index 71d3b3a..d833fea 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/constants/Constants.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/constants/Constants.java
@@ -1,8 +1,8 @@
package com.muyu.domain.constants;
/**
+ * @author qindongming
* @description: 系统常量
- * @author qindongming
*/
public class Constants {
/**
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/constants/PageResult.java b/cloud-etl-common/src/main/java/com/muyu/domain/constants/PageResult.java
index 2f0d9ff..161d28a 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/constants/PageResult.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/constants/PageResult.java
@@ -19,16 +19,20 @@ public class PageResult implements Serializable {
* 结果集合
*/
private List list;
+
public PageResult() {
}
+
public PageResult(long total, List list) {
this.total = total;
this.list = list;
}
- public static PageResult toPageResult(long total, List list){
- return new PageResult(total , list);
+
+ public static PageResult toPageResult(long total, List list) {
+ return new PageResult(total, list);
}
- public static Result> toResult(long total, List list){
- return Result.success(PageResult.toPageResult(total,list));
+
+ public static Result> toResult(long total, List list) {
+ return Result.success(PageResult.toPageResult(total, list));
}
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/constants/RabbitMQConstants.java b/cloud-etl-common/src/main/java/com/muyu/domain/constants/RabbitMQConstants.java
index 1597afb..ef2ccaa 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/constants/RabbitMQConstants.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/constants/RabbitMQConstants.java
@@ -6,5 +6,5 @@ package com.muyu.domain.constants;
* @Author: qindongming
*/
public class RabbitMQConstants {
- public static final String SEND_CODE="send_code";
+ public static final String SEND_CODE = "send_code";
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/constants/TokenConstants.java b/cloud-etl-common/src/main/java/com/muyu/domain/constants/TokenConstants.java
index 697b232..a65f6bc 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/constants/TokenConstants.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/constants/TokenConstants.java
@@ -1,7 +1,7 @@
package com.muyu.domain.constants;
/**
- * @author qindongming
+ * @author qindongming
* @description: 令牌常量
*/
public class TokenConstants {
diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/model/TestData.java b/cloud-etl-common/src/main/java/com/muyu/domain/model/TestData.java
index 9a2320c..c6fc49d 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/model/TestData.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/model/TestData.java
@@ -6,8 +6,9 @@ import java.util.List;
/**
* 测试数据
- * @ClassName TestData
+ *
* @author qdm
+ * @ClassName TestData
*/
@Data
public class TestData {
diff --git a/cloud-etl-common/src/main/java/com/muyu/dynamicLoad/DynamicLoader.java b/cloud-etl-common/src/main/java/com/muyu/dynamicLoad/DynamicLoader.java
index 6a7c843..83d137b 100644
--- a/cloud-etl-common/src/main/java/com/muyu/dynamicLoad/DynamicLoader.java
+++ b/cloud-etl-common/src/main/java/com/muyu/dynamicLoad/DynamicLoader.java
@@ -12,9 +12,8 @@ import java.util.HashMap;
import java.util.Map;
/**
- * @ClassName DynamicLoader
* @author qdm
- *
+ * @ClassName DynamicLoader
*/
public class DynamicLoader {
/**
@@ -54,7 +53,6 @@ public class DynamicLoader {
* URLClassLoader的具体作用就是将class文件加载到jvm虚拟机中去
*
* @author Administrator
- *
*/
public static class MemoryClassLoader extends URLClassLoader {
Map classBytes = new HashMap();
diff --git a/cloud-etl-common/src/main/java/com/muyu/dynamicLoad/MemoryJavaFileManager.java b/cloud-etl-common/src/main/java/com/muyu/dynamicLoad/MemoryJavaFileManager.java
index fefcf3c..bfcf4c3 100644
--- a/cloud-etl-common/src/main/java/com/muyu/dynamicLoad/MemoryJavaFileManager.java
+++ b/cloud-etl-common/src/main/java/com/muyu/dynamicLoad/MemoryJavaFileManager.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 将编译好的.class文件保存到内存当中，这里的内存也就是map映射当中
- * @ClassName MemoryJavaFileManager
+ *
* @author qdm
-
+ * @ClassName MemoryJavaFileManager
*/
@SuppressWarnings("rawtypes")
public final class MemoryJavaFileManager extends ForwardingJavaFileManager {
diff --git a/cloud-etl-common/src/main/java/com/muyu/model/DataModel.java b/cloud-etl-common/src/main/java/com/muyu/model/DataModel.java
index ee09449..a64ebc5 100644
--- a/cloud-etl-common/src/main/java/com/muyu/model/DataModel.java
+++ b/cloud-etl-common/src/main/java/com/muyu/model/DataModel.java
@@ -1,4 +1,5 @@
package com.muyu.model;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/cloud-etl-common/src/main/java/com/muyu/model/process/RecordProcessModel.java b/cloud-etl-common/src/main/java/com/muyu/model/process/RecordProcessModel.java
index 2ce2356..a8814ae 100644
--- a/cloud-etl-common/src/main/java/com/muyu/model/process/RecordProcessModel.java
+++ b/cloud-etl-common/src/main/java/com/muyu/model/process/RecordProcessModel.java
@@ -10,7 +10,6 @@ import java.util.List;
/**
* 记录处理模型
- *
*/
@Data
@SuperBuilder
diff --git a/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceEditReq.java b/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceEditReq.java
index e178b96..7362946 100644
--- a/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceEditReq.java
+++ b/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceEditReq.java
@@ -19,24 +19,38 @@ public class EngineMaintenanceEditReq extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 名称 */
+ /**
+ * 名称
+ */
private String name;
- /** 类型 */
+ /**
+ * 类型
+ */
private Integer type;
- /** 作用域 */
+ /**
+ * 作用域
+ */
private Integer scope;
- /** 引擎编码 */
+ /**
+ * 引擎编码
+ */
private String engineCode;
- /** 是否激活 */
+ /**
+ * 是否激活
+ */
private String isActivate;
- /** 状态 */
+ /**
+ * 状态
+ */
private String status;
- /** 描述 */
+ /**
+ * 描述
+ */
private String description;
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceQueryReq.java b/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceQueryReq.java
index f5a5133..7fd1a7b 100644
--- a/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceQueryReq.java
+++ b/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceQueryReq.java
@@ -19,26 +19,38 @@ public class EngineMaintenanceQueryReq extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 名称 */
+ /**
+ * 名称
+ */
private String name;
- /** 类型 */
+ /**
+ * 类型
+ */
private Integer type;
- /** 作用域 */
+ /**
+ * 作用域
+ */
private Integer scope;
- /** 引擎编码 */
+ /**
+ * 引擎编码
+ */
private String engineCode;
- /** 是否激活 */
+ /**
+ * 是否激活
+ */
private String isActivate;
- /** 状态 */
+ /**
+ * 状态
+ */
private String status;
- private Integer pageNum=1;
- private Integer pageSize=5;
+ private Integer pageNum = 1;
+ private Integer pageSize = 5;
private String description;
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceSaveReq.java b/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceSaveReq.java
index 510e4cf..c20255c 100644
--- a/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceSaveReq.java
+++ b/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceSaveReq.java
@@ -19,34 +19,50 @@ public class EngineMaintenanceSaveReq extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 编号 */
+ /**
+ * 编号
+ */
private Long id;
- /** 名称 */
+ /**
+ * 名称
+ */
private String name;
- /** 类型 */
+ /**
+ * 类型
+ */
private Integer type;
- /** 作用域 */
+ /**
+ * 作用域
+ */
private Integer scope;
- /** 引擎编码 */
+ /**
+ * 引擎编码
+ */
private String engineCode;
- /** 是否激活 */
+ /**
+ * 是否激活
+ */
private String isActivate;
- /** 状态 */
+ /**
+ * 状态
+ */
private String status;
- /** 描述 */
+ /**
+ * 描述
+ */
private String description;
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionEditReq.java b/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionEditReq.java
index 8706724..8debc2d 100644
--- a/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionEditReq.java
+++ b/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionEditReq.java
@@ -16,34 +16,52 @@ import lombok.experimental.SuperBuilder;
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
-public class EngineVersionEditReq extends BaseEntity {
+public class EngineVersionEditReq extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 版本类名 */
+ /**
+ * 版本类名
+ */
private String versionClass;
- /** 版本名称 */
+ /**
+ * 版本名称
+ */
private String name;
- /** 版本编码 */
+ /**
+ * 版本编码
+ */
private String versionCode;
- /** 是否激活 */
+ /**
+ * 是否激活
+ */
private String isActivate;
- /** 版本状态 */
+ /**
+ * 版本状态
+ */
private Integer status;
- /** 版本测试状态 */
+ /**
+ * 版本测试状态
+ */
private Integer testStatus;
- /** 规则内容 */
+ /**
+ * 规则内容
+ */
private String ruleContent;
- /** 引擎维护编号 */
+ /**
+ * 引擎维护编号
+ */
private Long engineMaintenanceId;
- /** 描述 */
+ /**
+ * 描述
+ */
private String description;
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionListResp.java b/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionListResp.java
index f9c9682..6dd13f2 100644
--- a/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionListResp.java
+++ b/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionListResp.java
@@ -20,30 +20,48 @@ import java.util.List;
@NoArgsConstructor
@SuperBuilder
public class EngineVersionListResp extends BaseEntity {
- /** 编号 */
+ /**
+ * 编号
+ */
private Long id;
- /** 名称 */
+ /**
+ * 名称
+ */
private String name;
- /** 类型 */
+ /**
+ * 类型
+ */
private Integer type;
- /** 作用域 */
+ /**
+ * 作用域
+ */
private Integer scope;
- /** 引擎编码 */
+ /**
+ * 引擎编码
+ */
private String engineCode;
- /** 是否激活 */
+ /**
+ * 是否激活
+ */
private String isActivate;
- /** 状态 */
+ /**
+ * 状态
+ */
private String status;
- /** 描述 */
+ /**
+ * 描述
+ */
private String description;
- /** 规则引擎版本列表 */
+ /**
+ * 规则引擎版本列表
+ */
private List engineVersionList;
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionQueryReq.java b/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionQueryReq.java
index 9976f59..582faa5 100644
--- a/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionQueryReq.java
+++ b/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionQueryReq.java
@@ -1,9 +1,11 @@
package com.muyu.req;
-import com.muyu.common.core.web.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
+
+import com.muyu.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
/**
* @Author：qdm
* @Package：com.muyu.req
@@ -14,12 +16,18 @@ import lombok.experimental.SuperBuilder;
@NoArgsConstructor
@AllArgsConstructor
public class EngineVersionQueryReq extends BaseEntity {
- /** 版本编码 */
+ /**
+ * 版本编码
+ */
private String versionCode;
- /** 规则内容 */
+ /**
+ * 规则内容
+ */
private String ruleContent;
- /** 引擎维护编号 */
+ /**
+ * 引擎维护编号
+ */
private Long engineMaintenanceId;
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionSaveReq.java b/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionSaveReq.java
index fd5d097..0e1f521 100644
--- a/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionSaveReq.java
+++ b/cloud-etl-common/src/main/java/com/muyu/req/EngineVersionSaveReq.java
@@ -18,36 +18,58 @@ import lombok.experimental.SuperBuilder;
public class EngineVersionSaveReq {
private static final long serialVersionUID = 1L;
- /** 编号 */
+ /**
+ * 编号
+ */
private Long id;
- /** 版本类名 */
+ /**
+ * 版本类名
+ */
private String versionClass;
- /** 版本名称 */
+ /**
+ * 版本名称
+ */
private String name;
- /** 版本编码 */
+ /**
+ * 版本编码
+ */
private String versionCode;
- /** 是否激活 */
+ /**
+ * 是否激活
+ */
private String isActivate;
- /** 版本状态 */
+ /**
+ * 版本状态
+ */
private Integer status;
- /** 版本测试状态 */
+ /**
+ * 版本测试状态
+ */
private Integer testStatus;
- /** 规则内容 */
+ /**
+ * 规则内容
+ */
private String ruleContent;
- /** 引擎维护编号 */
+ /**
+ * 引擎维护编号
+ */
private Long engineMaintenanceId;
- /** 描述 */
+ /**
+ * 描述
+ */
private String description;
- /** 描述 */
+ /**
+ * 描述
+ */
private String remark;
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/resp/EngineConfigScopeResp.java b/cloud-etl-common/src/main/java/com/muyu/resp/EngineConfigScopeResp.java
index b87af7b..3411fbd 100644
--- a/cloud-etl-common/src/main/java/com/muyu/resp/EngineConfigScopeResp.java
+++ b/cloud-etl-common/src/main/java/com/muyu/resp/EngineConfigScopeResp.java
@@ -7,6 +7,7 @@ import java.io.Serializable;
/**
* 规则引擎
+ *
* @ClassName RuleEngineScopeResp
*/
@Data
@@ -15,12 +16,18 @@ public class EngineConfigScopeResp implements Serializable {
public final static String[] ENGINE = new String[]{"TaskEngine", "DataSetEngine", "RecordEngine", "DataModelEngine"};
private static final long serialVersionUID = 1L;
- /** 类型 */
+ /**
+ * 类型
+ */
private String type;
- /** 名称 */
+ /**
+ * 名称
+ */
private String name;
- /** 代码 */
+ /**
+ * 代码
+ */
private String code;
}
diff --git a/cloud-etl-common/src/main/java/com/muyu/resp/EngineVersionListResp.java b/cloud-etl-common/src/main/java/com/muyu/resp/EngineVersionListResp.java
index f8825ea..a84e0b8 100644
--- a/cloud-etl-common/src/main/java/com/muyu/resp/EngineVersionListResp.java
+++ b/cloud-etl-common/src/main/java/com/muyu/resp/EngineVersionListResp.java
@@ -1,4 +1,5 @@
package com.muyu.resp;
+
import com.muyu.domain.EngineVersion;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -17,30 +18,48 @@ import java.util.List;
@NoArgsConstructor
@AllArgsConstructor
public class EngineVersionListResp {
- /** 编号 */
+ /**
+ * 编号
+ */
private Long id;
- /** 名称 */
+ /**
+ * 名称
+ */
private String name;
- /** 类型 */
+ /**
+ * 类型
+ */
private Integer type;
- /** 作用域 */
+ /**
+ * 作用域
+ */
private Integer scope;
- /** 引擎编码 */
+ /**
+ * 引擎编码
+ */
private String engineCode;
- /** 是否激活 */
+ /**
+ * 是否激活
+ */
private String isActivate;
- /** 状态 */
+ /**
+ * 状态
+ */
private String status;
- /** 描述 */
+ /**
+ * 描述
+ */
private String description;
- /** 规则引擎版本列表 */
+ /**
+ * 规则引擎版本列表
+ */
private List engineVersionList;
}
diff --git a/cloud-etl-server/pom.xml b/cloud-etl-server/pom.xml
index 90a5be4..40193bb 100644
--- a/cloud-etl-server/pom.xml
+++ b/cloud-etl-server/pom.xml
@@ -63,10 +63,10 @@
-
-
-
-
+
+
+
+
@@ -74,16 +74,16 @@
cloud-common-api-doc
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
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 533e072..656d8b6 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
@@ -111,11 +111,12 @@ public class EngIneController extends BaseController {
/**
* 通过id查询
+ *
* @param id
* @return
*/
@GetMapping("/findById/{id}")
- public Result findById(@PathVariable Long id){
+ public Result findById(@PathVariable Long id) {
//通过版本查询引擎
List list = engIneService.list(new LambdaQueryWrapper<>() {{
eq(EngineMaintenance::getId, id);
@@ -123,6 +124,6 @@ public class EngIneController extends BaseController {
EngineMaintenance engineMaintenance = engIneService.getById(id);
val engineReq = EngineMaintenance.engineReqBuild(engineMaintenance);
engineReq.setEngineMaintenanceList(list);
- return Result.success(engineReq);
+ return Result.success(engineReq);
}
}
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 73173a8..c13b73e 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
@@ -44,8 +44,8 @@ public class EngineVersionController {
}
@PostMapping("/insert")
- public Result insert(@RequestBody EngineVersion engineVersion) {
- return engineVersionService.add(engineVersion);
+ public Result insert(@RequestBody EngineVersion engineVersion) {
+ return engineVersionService.add(engineVersion);
}
@PostMapping("/update")
diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/Student.java b/cloud-etl-server/src/main/java/com/muyu/controller/Student.java
index cec92e4..0592276 100644
--- a/cloud-etl-server/src/main/java/com/muyu/controller/Student.java
+++ b/cloud-etl-server/src/main/java/com/muyu/controller/Student.java
@@ -17,7 +17,16 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@Builder
public class Student {
+ /**
+ * 测试编号
+ */
private Integer id;
- private String name;
+ /**
+ * 测试名称
+ */
+ private String name;
+ /**
+ * 测试年龄
+ */
private Integer age;
}
diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/Test.java b/cloud-etl-server/src/main/java/com/muyu/controller/Test.java
index 096de8c..eb352eb 100644
--- a/cloud-etl-server/src/main/java/com/muyu/controller/Test.java
+++ b/cloud-etl-server/src/main/java/com/muyu/controller/Test.java
@@ -19,15 +19,15 @@ public class Test {
student.setName("张");
- if (student.getName().length()<2|| student.getName().length()>16){
+ if (student.getName().length() < 2 || student.getName().length() > 16) {
- throw new RuntimeException("名称不合法");
+ throw new RuntimeException("名称不合法");
}
student.setName("");
- if (student.getAge()<1 || student.getAge()>120){
+ if (student.getAge() < 1 || student.getAge() > 120) {
throw new RuntimeException("名称不合法");
diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java
index 74c0bf5..539346d 100644
--- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java
+++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngineVersionServiceImpl.java
@@ -120,7 +120,7 @@ public class EngineVersionServiceImpl extends ServiceImpl bytecode = DynamicLoader.compile(RuleOperationConstants.CLASS_NAME +
@@ -144,11 +144,11 @@ public class EngineVersionServiceImpl extends ServiceImpl20){
+ if (type.getName().length() < 1 || type.getName().length() > 20) {
return Result.error("类型名称长度必须在2-10之间");
}
Integer res = typseMapper.add(type);
diff --git a/cloud-etl-server/src/main/resources/logback/prod.xml b/cloud-etl-server/src/main/resources/logback/prod.xml
index e25b6a2..3eff735 100644
--- a/cloud-etl-server/src/main/resources/logback/prod.xml
+++ b/cloud-etl-server/src/main/resources/logback/prod.xml
@@ -4,7 +4,8 @@
-
+
diff --git a/cloud-etl-server/src/main/resources/logback/test.xml b/cloud-etl-server/src/main/resources/logback/test.xml
index e25b6a2..3eff735 100644
--- a/cloud-etl-server/src/main/resources/logback/test.xml
+++ b/cloud-etl-server/src/main/resources/logback/test.xml
@@ -4,7 +4,8 @@
-
+
diff --git a/cloud-etl-server/src/main/resources/mapper/EnginLevelMapper.xml b/cloud-etl-server/src/main/resources/mapper/EnginLevelMapper.xml
index 217ae35..343ec73 100644
--- a/cloud-etl-server/src/main/resources/mapper/EnginLevelMapper.xml
+++ b/cloud-etl-server/src/main/resources/mapper/EnginLevelMapper.xml
@@ -31,11 +31,11 @@
where id = #{id}
diff --git a/cloud-etl-server/src/main/resources/mapper/EngineVersionMapper.xml b/cloud-etl-server/src/main/resources/mapper/EngineVersionMapper.xml
index dd93458..ecf2a37 100644
--- a/cloud-etl-server/src/main/resources/mapper/EngineVersionMapper.xml
+++ b/cloud-etl-server/src/main/resources/mapper/EngineVersionMapper.xml
@@ -4,8 +4,11 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
- INSERT INTO `text`.`engine_version` (`version_class`, `name`, `version_code`, `is_activate`, `status`, `test_status`, `rule_content`, `engine_maintenance_id`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES
-
- ( #{versionClass}, #{name}, #{versionCode}, #{isActivate}, #{status}, #{testStatus}, #{ruleContent}, #{engineMaintenanceId}, #{description}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark});
+ INSERT INTO `text`.`engine_version` (`version_class`, `name`, `version_code`, `is_activate`, `status`,
+ `test_status`, `rule_content`, `engine_maintenance_id`, `description`,
+ `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+ VALUES (#{versionClass}, #{name}, #{versionCode}, #{isActivate}, #{status}, #{testStatus}, #{ruleContent},
+ #{engineMaintenanceId}, #{description}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime},
+ #{remark});
diff --git a/elt-data-access/src/main/java/com/bwie/muyu/base/hander/DataEngineHandler.java b/elt-data-access/src/main/java/com/bwie/muyu/base/hander/DataEngineHandler.java
index 12ab0d4..6429370 100644
--- a/elt-data-access/src/main/java/com/bwie/muyu/base/hander/DataEngineHandler.java
+++ b/elt-data-access/src/main/java/com/bwie/muyu/base/hander/DataEngineHandler.java
@@ -12,10 +12,12 @@ import lombok.Data;
@Data
public class DataEngineHandler {
public static final ThreadLocal