diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/OrgConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/OrgConfig.java similarity index 93% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/OrgConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/OrgConfig.java index 79c290c..c6dad53 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/OrgConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/OrgConfig.java @@ -1,4 +1,4 @@ -package org.jeecg; +package org.jeecg.modules.supervision.common; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java similarity index 94% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java index 99f51e8..f285ca1 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectcloseout; +package org.jeecg.modules.supervision.inspectimprove.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java similarity index 95% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java index da509b4..0652dd3 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectimprove; +package org.jeecg.modules.supervision.inspectimprove.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectCloseoutConstant.java similarity index 57% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectCloseoutConstant.java index 95834a2..1fe0ac3 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectCloseoutConstant.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectcloseout; +package org.jeecg.modules.supervision.inspectimprove.constant; public class InspectCloseoutConstant { public static final int ZERO_INDEX = 0; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectConstant.java similarity index 82% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectConstant.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectConstant.java index e003e37..17f41c3 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/constant/InspectConstant.java @@ -1,6 +1,6 @@ -package org.jeecg.inspectimprove; +package org.jeecg.modules.supervision.inspectimprove.constant; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; public class InspectConstant { public static final String NEED_APPROVE_STR = "1"; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectCloseoutFlow.java similarity index 97% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectCloseoutFlow.java index 4dfea11..078a4a9 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectCloseoutFlow.java @@ -1,11 +1,13 @@ -package org.jeecg.inspectcloseout; +package org.jeecg.modules.supervision.inspectimprove.flow; import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectCloseoutConstant; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectImproveFlow.java similarity index 96% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectImproveFlow.java index f831bb6..bbde1f6 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/flow/InspectImproveFlow.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectimprove; +package org.jeecg.modules.supervision.inspectimprove.flow; import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; @@ -7,12 +7,14 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListener.java similarity index 90% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListener.java index bb0f00c..12573f7 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListener.java @@ -1,10 +1,10 @@ -package org.jeecg.inspectcloseout.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectcloseout.InspectCloseoutConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListener.java similarity index 77% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListener.java index 10b7909..275084f 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListener.java @@ -1,12 +1,12 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectConstant; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; -import org.jeecg.inspectimprove.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java similarity index 77% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java index 4ad07a3..15a3b4b 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListener.java @@ -1,12 +1,12 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectConstant; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; -import org.jeecg.inspectimprove.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListener.java similarity index 85% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListener.java index bbb8b2f..6d4499a 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListener.java @@ -1,12 +1,12 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; -import org.jeecg.inspectimprove.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java similarity index 87% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java index ad09dbf..bf67bf2 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListener.java @@ -1,13 +1,13 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectImproveConfig; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/DqInspectTaskStageIncrementListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/DqInspectTaskStageIncrementListener.java similarity index 87% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/DqInspectTaskStageIncrementListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/DqInspectTaskStageIncrementListener.java index 59e60e7..eb36cc6 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/DqInspectTaskStageIncrementListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/DqInspectTaskStageIncrementListener.java @@ -1,13 +1,13 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; -import org.jeecg.inspectimprove.InspectImproveConfig; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/LeaderApproveHelper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelper.java similarity index 93% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/LeaderApproveHelper.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelper.java index 9467875..0d79a77 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/listener/LeaderApproveHelper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelper.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakConfig.java similarity index 96% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakConfig.java index 1906616..7f8b161 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak; +package org.jeecg.modules.supervision.xispeak.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackConfig.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakFeedbackConfig.java similarity index 90% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackConfig.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakFeedbackConfig.java index ca6740e..a620fcc 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackConfig.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/config/XiSpeakFeedbackConfig.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeakfb; +package org.jeecg.modules.supervision.xispeak.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFeedbackFlow.java similarity index 96% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFeedbackFlow.java index cb929e4..8232c38 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/XiSpeakFeedbackFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFeedbackFlow.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeakfb; +package org.jeecg.modules.supervision.xispeak.flow; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -8,13 +8,14 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakFeedbackConfig; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakFlow.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFlow.java similarity index 97% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakFlow.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFlow.java index 59bfcba..bd22001 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/XiSpeakFlow.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/flow/XiSpeakFlow.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak; +package org.jeecg.modules.supervision.xispeak.flow; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -8,12 +8,13 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shiro.util.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgLeaderApproveListener.java similarity index 91% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgLeaderApproveListener.java index 22d4804..0100266 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgLeaderApproveListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -6,9 +6,9 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.runtime.Execution; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; @@ -18,7 +18,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgWorkerFinalApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgWorkerFinalApproveListener.java similarity index 88% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgWorkerFinalApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgWorkerFinalApproveListener.java index ee8825c..bf0f96e 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterBgWorkerFinalApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterBgWorkerFinalApproveListener.java @@ -1,14 +1,14 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.bg.xispeak.constant.XiSpeakConstant; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.constant.XiSpeakConstant; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import lombok.RequiredArgsConstructor; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/listener/AfterImplDeptLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveFeedbackListener.java similarity index 87% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/listener/AfterImplDeptLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveFeedbackListener.java index 62ac96e..759fa8e 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeakfb/listener/AfterImplDeptLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveFeedbackListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeakfb.listener; +package org.jeecg.modules.supervision.xispeak.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -6,17 +6,17 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeakFeedback; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakFeedbackService; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.tasktask.constant.FlowConstants; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; -import org.jeecg.xispeak.XiSpeakConfig; -import org.jeecg.xispeakfb.XiSpeakFeedbackConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakFeedbackConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -26,7 +26,7 @@ import java.util.*; @Slf4j @Component("AfterImplDeptLeaderApproveFeedbackListener") @RequiredArgsConstructor(onConstructor_ = @Autowired) -public class AfterImplDeptLeaderApproveListener implements TaskListener { +public class AfterImplDeptLeaderApproveFeedbackListener implements TaskListener { private static final long serialVersionUID = 1L; private final XiSpeakFeedbackConfig xiSpeakFeedbackConfig; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveListener.java similarity index 91% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveListener.java index d9cef0c..614e972 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderApproveListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -7,9 +7,9 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.runtime.Execution; import org.flowable.task.service.delegate.DelegateTask; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; @@ -19,7 +19,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java similarity index 93% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java index fa463f9..b7ba150 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplDeptLeaderStoreJsonListener.java @@ -1,15 +1,15 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.flowable.task.service.delegate.DelegateTask; import org.flowable.engine.delegate.TaskListener; // 🎯 1. 必须引入标准接口 -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerApproveListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerApproveListener.java similarity index 91% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerApproveListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerApproveListener.java index 286d84b..07a6ee7 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerApproveListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerApproveListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -6,10 +6,10 @@ import org.apache.commons.lang.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.runtime.Execution; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; @@ -19,7 +19,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerTemStoreListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerTemStoreListener.java similarity index 91% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerTemStoreListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerTemStoreListener.java index a01a4ef..67c4601 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterImplWorkerTemStoreListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterImplWorkerTemStoreListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -7,9 +7,9 @@ import org.flowable.engine.delegate.TaskListener; import org.flowable.engine.runtime.Execution; import org.flowable.task.service.delegate.DelegateTask; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; -import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; -import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; +import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak; +import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail; +import org.jeecg.modules.supervision.xispeak.service.IBgXiSpeakService; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; import lombok.RequiredArgsConstructor; import org.flowable.engine.RuntimeService; @@ -19,7 +19,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecg.modules.tasktask.service.ITaskTaskService; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterSDWApproveHqListener.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterSDWApproveHqListener.java similarity index 97% rename from jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterSDWApproveHqListener.java rename to jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterSDWApproveHqListener.java index 17557d5..4d9d0ca 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/xispeak/listener/AfterSDWApproveHqListener.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/xispeak/listener/AfterSDWApproveHqListener.java @@ -1,4 +1,4 @@ -package org.jeecg.xispeak.listener; +package org.jeecg.modules.supervision.xispeak.listener; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression; @@ -8,7 +8,7 @@ import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.extbpm.process.common.WorkFlowGlobals; -import org.jeecg.xispeak.XiSpeakConfig; +import org.jeecg.modules.supervision.xispeak.config.XiSpeakConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-boot-module/jeecg-module-flow/src/main/resources/application-flow.yml b/jeecg-module-supervision/src/main/resources/application-flow.yml similarity index 100% rename from jeecg-boot-module/jeecg-module-flow/src/main/resources/application-flow.yml rename to jeecg-module-supervision/src/main/resources/application-flow.yml diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/InspectCloseoutFlowTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectCloseoutFlowTest.java similarity index 96% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/InspectCloseoutFlowTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectCloseoutFlowTest.java index f096372..1159eb4 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/InspectCloseoutFlowTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectCloseoutFlowTest.java @@ -1,13 +1,15 @@ -package org.jeecg.inspectcloseout; +package org.jeecg.modules.supervision.inspectimprove; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.inspectcloseout.InspectCloseoutConfig.InspectCloseoutProperties; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig.InspectCloseoutProperties; +import org.jeecg.modules.supervision.inspectimprove.flow.InspectCloseoutFlow; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/InspectImproveFlowTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectImproveFlowTest.java similarity index 95% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/InspectImproveFlowTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectImproveFlowTest.java index f551f16..9c7c1be 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/InspectImproveFlowTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/InspectImproveFlowTest.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectimprove; +package org.jeecg.modules.supervision.inspectimprove; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; @@ -7,11 +7,14 @@ import com.alibaba.fastjson.JSONObject; import com.jeecg.weibo.exception.BusinessException; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; -import org.jeecg.OrgConfig; +import org.jeecg.modules.supervision.common.OrgConfig; import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.inspectimprove.InspectImproveConfig.InspectImproveProperties; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig.InspectImproveProperties; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.flow.InspectImproveFlow; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListenerTest.java similarity index 88% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListenerTest.java index 463abbc..4462fd4 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectcloseout/listener/AfterCloseoutApprovedListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterCloseoutApprovedListenerTest.java @@ -1,10 +1,10 @@ -package org.jeecg.inspectcloseout.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.mockito.Mockito.*; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectcloseout.InspectCloseoutConfig; -import org.jeecg.inspectcloseout.InspectCloseoutConfig.InspectCloseoutProperties; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectCloseoutConfig.InspectCloseoutProperties; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java similarity index 90% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java index 1a08a03..b2bbd67 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterDqLeaderApproveListenerTest.java @@ -1,10 +1,10 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.mockito.Mockito.*; import org.flowable.engine.RuntimeService; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java similarity index 89% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java index 104fd84..eedf323 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterImplDeptLeaderApproveListenerTest.java @@ -1,10 +1,10 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.mockito.Mockito.*; import org.flowable.engine.RuntimeService; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectConstant; +import org.jeecg.modules.supervision.inspectimprove.constant.InspectConstant; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java similarity index 83% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java index 03fcadc..8ed7d00 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterInspectImproveCompleteListenerTest.java @@ -1,12 +1,12 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.mockito.Mockito.*; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectImproveConfig; -import org.jeecg.inspectimprove.InspectImproveConfig.InspectImproveProperties; -import org.jeecg.modules.dj.inspectimprove.entity.DjInspectImprove; -import org.jeecg.modules.dj.inspectimprove.service.IDjInspectImproveService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig.InspectImproveProperties; +import org.jeecg.modules.supervision.inspectimprove.entity.DjInspectImprove; +import org.jeecg.modules.supervision.inspectimprove.service.IDjInspectImproveService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java similarity index 89% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java index cbd219a..0b957f4 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/AfterMeasureResLeaderStoreListenerTest.java @@ -1,13 +1,13 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import org.flowable.task.service.delegate.DelegateTask; -import org.jeecg.inspectimprove.InspectImproveConfig; -import org.jeecg.inspectimprove.InspectImproveConfig.InspectImproveProperties; -import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; -import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig; +import org.jeecg.modules.supervision.inspectimprove.config.InspectImproveConfig.InspectImproveProperties; +import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask; +import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/LeaderApproveHelperTest.java b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelperTest.java similarity index 96% rename from jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/LeaderApproveHelperTest.java rename to jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelperTest.java index e285b7e..2288f76 100644 --- a/jeecg-boot-module/jeecg-module-flow/src/test/java/org/jeecg/inspectimprove/listener/LeaderApproveHelperTest.java +++ b/jeecg-module-supervision/src/test/java/org/jeecg/modules/supervision/inspectimprove/listener/LeaderApproveHelperTest.java @@ -1,4 +1,4 @@ -package org.jeecg.inspectimprove.listener; +package org.jeecg.modules.supervision.inspectimprove.listener; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*;