diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/Engine.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/Engine.java similarity index 80% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/Engine.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/Engine.java index 401833d..bf0e5f5 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/Engine.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/Engine.java @@ -1,4 +1,4 @@ -package com.muyu.engine.domain.engine; +package com.muyu.etl.domain.scope.engine; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/action/ActionDiscard.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/action/ActionDiscard.java similarity index 75% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/action/ActionDiscard.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/action/ActionDiscard.java index 5f0ab74..c4d437b 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/action/ActionDiscard.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/action/ActionDiscard.java @@ -1,4 +1,4 @@ -package com.muyu.engine.domain.engine.action; +package com.muyu.etl.domain.scope.engine.action; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/custom/IsNotNullEngineCustom.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/custom/IsNotNullEngineCustom.java similarity index 68% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/custom/IsNotNullEngineCustom.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/custom/IsNotNullEngineCustom.java index aa2529f..8a0810f 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/custom/IsNotNullEngineCustom.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/custom/IsNotNullEngineCustom.java @@ -1,8 +1,8 @@ -package com.muyu.engine.domain.engine.custom; +package com.muyu.etl.domain.scope.engine.custom; -import com.muyu.engine.domain.engine.action.ActionDiscard; -import com.muyu.engine.domain.engine.scope.DataModelEngine; +import com.muyu.etl.domain.scope.engine.action.ActionDiscard; +import com.muyu.etl.domain.scope.engine.scope.DataModelEngine; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/scope/DataModelEngine.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataModelEngine.java similarity index 74% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/scope/DataModelEngine.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataModelEngine.java index cdb0281..bcec429 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/scope/DataModelEngine.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataModelEngine.java @@ -1,10 +1,11 @@ -package com.muyu.engine.domain.engine.scope; +package com.muyu.etl.domain.scope.engine.scope; -import com.muyu.engine.domain.engine.Engine; -import com.muyu.engine.domain.model.DataModel; -import com.muyu.engine.domain.scope.DataModelContext; -import com.muyu.engine.domain.scope.model.DataProcessModel; +import com.muyu.etl.domain.scope.engine.Engine; +import com.muyu.etl.domain.scope.model.DataModel; +import com.muyu.etl.domain.scope.scope.DataModelContext; +import com.muyu.etl.domain.scope.scope.model.DataProcessModel; +import lombok.Data; /** * @Author: DongZeLiang @@ -12,6 +13,7 @@ import com.muyu.engine.domain.scope.model.DataProcessModel; * @Description: 数据模型引擎接口 * @Version: 1.0 */ +@Data public abstract class DataModelEngine implements Engine { private DataModelContext dataModelContext; diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/scope/DataSetEngine.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataSetEngine.java similarity index 61% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/scope/DataSetEngine.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataSetEngine.java index 0bdaccf..7437051 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/scope/DataSetEngine.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataSetEngine.java @@ -1,9 +1,11 @@ -package com.muyu.engine.domain.engine.scope; +package com.muyu.etl.domain.scope.engine.scope; -import com.muyu.engine.domain.engine.Engine; -import com.muyu.engine.domain.model.DataSetModel; -import com.muyu.engine.domain.scope.DataSetContext; -import com.muyu.engine.domain.scope.model.DataSetProcessModel; + +import com.muyu.etl.domain.scope.engine.Engine; +import com.muyu.etl.domain.scope.model.DataSetModel; +import com.muyu.etl.domain.scope.scope.DataSetContext; +import com.muyu.etl.domain.scope.scope.model.DataSetProcessModel; +import lombok.Data; /** * 数据模型引擎接口 @@ -12,6 +14,7 @@ import com.muyu.engine.domain.scope.model.DataSetProcessModel; * @Description: 数据模型引擎接口 * @Version: 1.0 */ +@Data public abstract class DataSetEngine implements Engine { //上下文对象 private DataSetContext dataSetContext; diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/scope/RecordEngine.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/RecordEngine.java similarity index 64% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/scope/RecordEngine.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/RecordEngine.java index 8cfe267..f9d0910 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/engine/scope/RecordEngine.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/RecordEngine.java @@ -1,10 +1,11 @@ -package com.muyu.engine.domain.engine.scope; +package com.muyu.etl.domain.scope.engine.scope; -import com.muyu.engine.domain.engine.Engine; -import com.muyu.engine.domain.model.RecordModel; -import com.muyu.engine.domain.scope.RecordContext; -import com.muyu.engine.domain.scope.model.RecordProcessModel; +import com.muyu.etl.domain.scope.engine.Engine; +import com.muyu.etl.domain.scope.model.RecordModel; +import com.muyu.etl.domain.scope.scope.RecordContext; +import com.muyu.etl.domain.scope.scope.model.RecordProcessModel; +import lombok.Data; /** * @Author: DongZeLiang @@ -12,6 +13,7 @@ import com.muyu.engine.domain.scope.model.RecordProcessModel; * @Description: 数据模型引擎接口 * @Version: 1.0 */ +@Data public abstract class RecordEngine implements Engine { private RecordContext recordContext; diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/DataModel.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataModel.java similarity index 92% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/DataModel.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataModel.java index 72dbed1..38d38c4 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/DataModel.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataModel.java @@ -1,4 +1,4 @@ -package com.muyu.engine.domain.model; +package com.muyu.etl.domain.scope.model; import lombok.Data; diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/DataSetModel.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataSetModel.java similarity index 82% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/DataSetModel.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataSetModel.java index 7a5e5a7..9fa2b14 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/DataSetModel.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataSetModel.java @@ -1,4 +1,8 @@ -package com.muyu.engine.domain.model; +package com.muyu.etl.domain.scope.model; + +import lombok.Data; + +import java.io.Serializable; /** * 一页 @@ -7,7 +11,8 @@ package com.muyu.engine.domain.model; * @Description: 一页 * @Version: 1.0 */ -public class DataSetModel { +@Data +public class DataSetModel implements Serializable { // [[DataModel,DataModel,DataModel],[DataModel,DataModel,DataModel]] diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/DataStandard.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataStandard.java similarity index 78% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/DataStandard.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataStandard.java index a1ebc0a..1138a26 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/DataStandard.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataStandard.java @@ -1,4 +1,4 @@ -package com.muyu.engine.domain.model; +package com.muyu.etl.domain.scope.model; /** * 数据标准 diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/RecordModel.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/RecordModel.java similarity index 94% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/RecordModel.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/RecordModel.java index 2ae82ac..ab9127d 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/model/RecordModel.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/RecordModel.java @@ -1,4 +1,4 @@ -package com.muyu.engine.domain.model; +package com.muyu.etl.domain.scope.model; /** * 记录模型 diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/DataModelContext.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataModelContext.java similarity index 71% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/DataModelContext.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataModelContext.java index f29f7a2..7b1bf57 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/DataModelContext.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataModelContext.java @@ -1,7 +1,7 @@ -package com.muyu.engine.domain.scope; +package com.muyu.etl.domain.scope.scope; -import com.muyu.engine.domain.scope.model.DataProcessModel; +import com.muyu.etl.domain.scope.scope.model.DataProcessModel; /** * @Author: DongZeLiang @@ -9,7 +9,7 @@ import com.muyu.engine.domain.scope.model.DataProcessModel; * @Description: 数据模型 * @Version: 1.0 */ -public class DataModelContext implements ScopeContext { +public class DataModelContext implements ScopeContext { private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>(); diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/DataSetContext.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataSetContext.java similarity index 81% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/DataSetContext.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataSetContext.java index cc7a4bd..56239ef 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/DataSetContext.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataSetContext.java @@ -1,7 +1,7 @@ -package com.muyu.engine.domain.scope; +package com.muyu.etl.domain.scope.scope; -import com.muyu.engine.domain.scope.model.DataSetProcessModel; +import com.muyu.etl.domain.scope.scope.model.DataSetProcessModel; /** * @Author: DongZeLiang @@ -9,7 +9,7 @@ import com.muyu.engine.domain.scope.model.DataSetProcessModel; * @Description: 数据集 * @Version: 1.0 */ -public class DataSetContext implements ScopeContext{ +public class DataSetContext implements ScopeContext { private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>(); @@ -23,4 +23,6 @@ public class DataSetContext implements ScopeContext{ public DataSetProcessModel get() { return THREAD_LOCAL.get(); } + + } diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/RecordContext.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/RecordContext.java similarity index 82% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/RecordContext.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/RecordContext.java index ee88c84..44e70f5 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/RecordContext.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/RecordContext.java @@ -1,7 +1,7 @@ -package com.muyu.engine.domain.scope; +package com.muyu.etl.domain.scope.scope; -import com.muyu.engine.domain.scope.model.RecordProcessModel; +import com.muyu.etl.domain.scope.scope.model.RecordProcessModel; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/ScopeContext.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/ScopeContext.java similarity index 78% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/ScopeContext.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/ScopeContext.java index 5ea801a..f249fc6 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/ScopeContext.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/ScopeContext.java @@ -1,4 +1,4 @@ -package com.muyu.engine.domain.scope; +package com.muyu.etl.domain.scope.scope; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/TaskContext.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/TaskContext.java similarity index 83% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/TaskContext.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/TaskContext.java index dc2fe50..6d3c5d4 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/TaskContext.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/TaskContext.java @@ -1,4 +1,4 @@ -package com.muyu.engine.domain.scope; +package com.muyu.etl.domain.scope.scope; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/model/DataProcessModel.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataProcessModel.java similarity index 69% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/model/DataProcessModel.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataProcessModel.java index 328fd70..0dc4986 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/model/DataProcessModel.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataProcessModel.java @@ -1,7 +1,7 @@ -package com.muyu.engine.domain.scope.model; +package com.muyu.etl.domain.scope.scope.model; -import com.muyu.engine.domain.model.DataModel; +import com.muyu.etl.domain.scope.model.DataModel; import lombok.Data; /** diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/model/DataSetProcessModel.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataSetProcessModel.java similarity index 70% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/model/DataSetProcessModel.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataSetProcessModel.java index fb4dcb4..8beec37 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/model/DataSetProcessModel.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataSetProcessModel.java @@ -1,7 +1,7 @@ -package com.muyu.engine.domain.scope.model; +package com.muyu.etl.domain.scope.scope.model; -import com.muyu.engine.domain.model.DataSetModel; +import com.muyu.etl.domain.scope.model.DataSetModel; import lombok.Data; /** diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/model/RecordProcessModel.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/RecordProcessModel.java similarity index 73% rename from muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/model/RecordProcessModel.java rename to muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/RecordProcessModel.java index e4fea2d..9c0aa15 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/scope/model/RecordProcessModel.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/RecordProcessModel.java @@ -1,7 +1,6 @@ -package com.muyu.engine.domain.scope.model; +package com.muyu.etl.domain.scope.scope.model; - -import com.muyu.engine.domain.model.RecordModel; +import com.muyu.etl.domain.scope.model.RecordModel; import lombok.Data; /** diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/test/Engine_custom_email_test.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/test/Engine_custom_email_test.java new file mode 100644 index 0000000..658527f --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/test/Engine_custom_email_test.java @@ -0,0 +1,22 @@ +package com.muyu.etl.domain.scope.test; + +import com.muyu.etl.domain.scope.engine.action.ActionDiscard; +import com.muyu.etl.domain.scope.engine.scope.DataModelEngine; + +/** + * @Author: Saisai + * @date: 2024/4/3 + * @Description: 测试-test + * @Version: 1.0 + */ + public class Engine_custom_email_test extends DataModelEngine { + @Override + public void execution () { + Object value = getValue(); + + if (value == null || "".equals(value) || "null".equals(value)) { + throw new ActionDiscard(); + } + } + } + diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/util/JDBCUtils.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/util/JDBCUtils.java index 531e407..48c18a8 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/util/JDBCUtils.java +++ b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/util/JDBCUtils.java @@ -20,7 +20,6 @@ public class JDBCUtils { Properties properties = new Properties(); try { //Class.forName(driver); - properties.load(new FileInputStream("src/api/connection/mysql.properties")); driver = properties.getProperty("driver"); url = properties.getProperty("url"); diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java index fbb279a..c406743 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java @@ -14,17 +14,15 @@ import com.muyu.etl.domain.resp.BasicTableInfoResp; import com.muyu.etl.domain.resp.StructureValueResp; import com.muyu.etl.domain.resp.TableInfoStructureResp; import com.muyu.etl.domain.resp.TableTreeResp; +import com.muyu.etl.domain.scope.model.DataModel; +import com.muyu.etl.domain.scope.model.DataSetModel; +import com.muyu.etl.domain.scope.model.RecordModel; +import com.muyu.etl.domain.scope.scope.DataModelContext; import com.muyu.etl.mapper.BasicConfigInfoMapper; import com.muyu.etl.service.BasicConfigInfoService; import com.muyu.etl.service.StructureService; import com.muyu.etl.service.TableInfoService; -import lombok.SneakyThrows; import lombok.extern.log4j.Log4j2; -import org.springframework.amqp.core.ExchangeTypes; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.rabbit.annotation.Exchange; -import org.springframework.amqp.rabbit.annotation.Queue; -import org.springframework.amqp.rabbit.annotation.QueueBinding; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,9 +30,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.ServletException; import java.sql.*; +import java.util.*; import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -66,7 +63,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl(BasicConfigInfo.class) {{ - eq(BasicConfigInfo::getId, basicConfigInfo.getId()); - }}); +// this.saveOrUpdate(basicConfigInfo, new LambdaUpdateWrapper<>(BasicConfigInfo.class) {{ +// eq(BasicConfigInfo::getId, basicConfigInfo.getId()); +// }}); + this.updateById(basicConfigInfo); //树级结构，库，表 TableInfo tableInfoInsert = TableInfo.builder() .basicId(basicConfigInfo.getId()) @@ -175,7 +173,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl(TableInfo.class) {{ + tableInfoService.saveOrUpdate(tableInfoInsert, new LambdaUpdateWrapper<>(TableInfo.class) {{ eq(TableInfo::getTableName, tableInfoInsert.getTableName()); eq(TableInfo::getBasicId, basicConfigInfo.getId()); }}); @@ -189,17 +187,16 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl { try { - syncData(finalConn, databaseName, table); + syncData(conn, databaseName, table); } catch (SQLException e) { try { throw new ServletException("同步数据失败"); @@ -227,26 +223,11 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl{ - message.getMessageProperties().setConsumerTag(UUID.randomUUID().toString().replaceAll("-","")); + rabbitTemplate.convertAndSend("basicInfoQueue", JSON.toJSONString(basicConfigInfo), message -> { + message.getMessageProperties().setConsumerTag(UUID.randomUUID().toString().replaceAll("-", "")); return message; }); } catch (SQLException e) { @@ -442,18 +423,17 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl structureList = structureService.list(new LambdaQueryWrapper() {{ eq(Structure::getTableId, tableInfoScopeReq.getId()); }}); - //字段级 if (tableInfoScopeReq.getLevel().equals("data-field")) { - return getList(tableInfoScopeReq, structureList, 1); + return getList(tableInfoScopeReq, structureList, 0,1); } //行级 if (tableInfoScopeReq.getLevel().equals("data-record")) { - return getList(tableInfoScopeReq, structureList, 5); + return getList(tableInfoScopeReq, structureList, 0,5); } //页级 if (tableInfoScopeReq.getLevel().equals("data-set")) { - return getList(tableInfoScopeReq, structureList, 10); + return getList(tableInfoScopeReq, structureList, 3,10); } return null; } @@ -463,21 +443,44 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl> getList(TableInfoScopeReq tableInfoScopeReq, List structureList, int num) { - List> list = null; - HashMap valueRespHashMap = new HashMap<>(); + public List getList(TableInfoScopeReq tableInfoScopeReq, List structureList, int last,int num) { + List list = new ArrayList<>(); BasicConfigInfo basicConfigInfo = this.selectBasicConfigInfoById(tableInfoScopeReq.getBasicId()); try { + // 获取该接入的连接 Connection conn = this.getConn(basicConfigInfo); - PreparedStatement ps = conn.prepareStatement("select * from " + tableInfoScopeReq.getTableName() + " limit ?"); - ResultSet rs = ps.executeQuery(); - while (rs.next()) { - for (int i = 0; i < structureList.size(); i++) { - StructureValueResp structureValueResp = StructureValueResp.saveBuilder(structureList.get(i), - String.valueOf(rs.getObject(i + 1))); - valueRespHashMap.put(structureList.get(i).getColumnName(), structureValueResp); - list.add(valueRespHashMap); + for (int i = 0; i < last; i++) { + PreparedStatement ps = conn.prepareStatement("select * from " + tableInfoScopeReq.getTableName() + " limit ?,?"); + //随机条 + ps.setInt(1, i); + ps.setInt(2, num); + ResultSet rs = ps.executeQuery(); + List recordModelList = new ArrayList<>(); + while (rs.next()) { + List dataModelList = new ArrayList<>(); + for (int ia = 0; ia < structureList.size(); ia++) { + int finalI = ia; + DataModel dataModel = new DataModel(){{ + setKey(structureList.get(finalI).getColumnName()); + setValue(String.valueOf(rs.getObject(structureList.get(finalI).getColumnName()))); + setProcessClass(String.class); + setSourceType(structureList.get(finalI).getColumnType()); + setSourceType(structureList.get(finalI).getJavaType()); + }}; + log.info("对象{}",dataModel); + dataModelList.add(dataModel); + + } + // 记录模型 + RecordModel recordModel = RecordModel.build(dataModelList.toArray(new DataModel[structureList.size()])); + recordModelList.add(recordModel); + log.info("recordModelList数据：{}", recordModelList); } + + // 页数据 + DataSetModel build = DataSetModel.build(recordModelList.toArray(new RecordModel[num])); + list.add(build); + log.info("list数据：{}", list); } } catch (SQLException e) { throw new RuntimeException(e); diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/bootstrap.yml index 26cb9ef..3b09e15 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/resources/bootstrap.yml @@ -4,6 +4,24 @@ server: # Spring spring: + rabbitmq: + host: 43.142.100.73 + port: 5672 + username: guest + password: guest + virtual-host: / + publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) + publisher-returns: true #确认消息已发送到队列(Queue) + listener: + simple: + prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 + acknowledge-mode: manual # 设置消费端手动ack确认 + retry: + enabled: true # 是否支持重试 + template: + # 只要消息抵达Queue，就会异步发送优先回调return firm + mandatory: true + application: # 应用名称 name: muyu-etl @@ -26,20 +44,3 @@ spring: logging: level: com.muyu.etl.mapper: DEBUG -rabbitmq: - host: 43.142.100.73 - port: 5672 - username: guest - password: guest - virtual-host: / - publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) - publisher-returns: true #确认消息已发送到队列(Queue) - listener: - simple: - prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 - acknowledge-mode: manual # 设置消费端手动ack确认 - retry: - enabled: true # 是否支持重试 - template: - # 只要消息抵达Queue，就会异步发送优先回调return firm - mandatory: true diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java index 3cc2ee3..e3606f8 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java @@ -21,7 +21,7 @@ public class FastDfsSysFileServiceImpl implements ISysFileService { /** * 域名或本机访问地址 */ - @Value("${fdfs.domain}") + @Value("${fdfs.scope}") public String domain; @Autowired diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java index f3ce089..685251c 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java +++ b/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java @@ -23,7 +23,7 @@ public class LocalSysFileServiceImpl implements ISysFileService { /** * 域名或本机访问地址 */ - @Value("${file.domain}") + @Value("${file.scope}") public String domain; /** diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java index 021628a..52a9d7a 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java +++ b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java @@ -164,11 +164,11 @@ public class VelocityUtils { String mybatisPath = MYBATIS_PATH + "/" + moduleName; String vuePath = "vue"; - if (template.contains("domain.java.vm")) { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); + if (template.contains("scope.java.vm")) { + fileName = StringUtils.format("{}/scope/{}.java", javaPath, className); } - if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); + if (template.contains("sub-scope.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) { + fileName = StringUtils.format("{}/scope/{}.java", javaPath, genTable.getSubTable().getClassName()); } else if (template.contains("mapper.java.vm")) { fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); } else if (template.contains("redis.java.vm")) { diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/src/main/java/com/muyu/remote/RemoteRuleEngineService.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/src/main/java/com/muyu/remote/RemoteRuleEngineService.java index 6a9e3b4..1fda732 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/src/main/java/com/muyu/remote/RemoteRuleEngineService.java +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/src/main/java/com/muyu/remote/RemoteRuleEngineService.java @@ -2,8 +2,8 @@ // //import com.muyu.common.core.constant.SecurityConstants; //import com.muyu.common.core.constant.ServiceNameConstants; -//import com.muyu.common.core.domain.Result; -//import com.muyu.common.system.domain.LoginUser; +//import com.muyu.common.core.scope.Result; +//import com.muyu.common.system.scope.LoginUser; //import com.muyu.remote.factory.RemoteRuleEngineFallbackFactory; //import org.springframework.cloud.openfeign.FeignClient; //import org.springframework.web.bind.annotation.GetMapping; diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/src/main/java/com/muyu/remote/factory/RemoteRuleEngineFallbackFactory.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/src/main/java/com/muyu/remote/factory/RemoteRuleEngineFallbackFactory.java index 4612f07..7517fad 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/src/main/java/com/muyu/remote/factory/RemoteRuleEngineFallbackFactory.java +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-remote/src/main/java/com/muyu/remote/factory/RemoteRuleEngineFallbackFactory.java @@ -1,7 +1,7 @@ //package com.muyu.remote.factory; // -//import com.muyu.common.core.domain.Result; -//import com.muyu.common.system.domain.LoginUser; +//import com.muyu.common.core.scope.Result; +//import com.muyu.common.system.scope.LoginUser; //import com.muyu.remote.RemoteRuleEngineService; //import org.slf4j.Logger; //import org.slf4j.LoggerFactory; diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml index e6944aa..b181813 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml @@ -29,6 +29,14 @@ muyu-ruleEngine-common + + + com.muyu + muyu-etl-common + + + + com.alibaba.cloud diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java index 8bf8e7c..9791947 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java @@ -115,7 +115,7 @@ public class RuleEngineVersionServiceImpl extends ServiceImpl() {{ eq(RuleEngineVersion::getCode, ruleEngineVersion.getCode()); }}); - if (!"null".equals(one)) throw new ServletException("该版本已存在"); + if (one.getStatus()=="2") throw new ServletException("该版本已发布，无法更改"); String codeIng = ruleEngineVersion.getCodeIng(); try { String path = codeIng.substring(codeIng.indexOf("com"), codeIng.indexOf(";")).replaceAll("\\.", "/").trim(); @@ -129,9 +129,11 @@ public class RuleEngineVersionServiceImpl extends ServiceImpl