diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/CodeMsgEnum.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/CodeMsgEnum.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/CodeMsgEnum.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/CodeMsgEnum.java index 4d88e137..07f6dd12 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/CodeMsgEnum.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/CodeMsgEnum.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable; +package com.yxt.supervise.flowable; import com.yxt.common.core.result.IResultCodeMsg; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/FlowableApplication.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/FlowableApplication.java index 607c97d5..e85e9446 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/FlowableApplication.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable; +package com.yxt.supervise.flowable; import org.springframework.boot.SpringApplication; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowCommentDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowCommentDto.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowCommentDto.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowCommentDto.java index a8fd9f6d..84c658f1 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowCommentDto.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowCommentDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; import lombok.Builder; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowDto.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowDto.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowDto.java index c916a3ba..b0757d3c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowDto.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowProcinst.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowProcinst.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowProcinst.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowProcinst.java index 2bef0ee3..24784f43 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowProcinst.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowProcinst.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; public class FlowProcinst { private String ID_;// `varchar (192), diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowTask.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowTask.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowTask.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowTask.java index f5d0a8f6..7796b96e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowTask.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowTask.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowTaskQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowTaskQuery.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowTaskQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowTaskQuery.java index bdfb9c40..07fa153c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowTaskQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowTaskQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowTaskVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowTaskVo.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowTaskVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowTaskVo.java index e3f83a32..0f57c2e4 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowTaskVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowTaskVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/Flowable.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/Flowable.java similarity index 72% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/Flowable.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/Flowable.java index ac33d6ab..96af3f84 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/Flowable.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/Flowable.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowableFallback.java similarity index 79% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowableFallback.java index a8feb1d3..dca8fa80 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowableFallback.java @@ -1,12 +1,10 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.supervise.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Component; -import java.util.Map; - @Component public class FlowableFallback implements FlowableFeign { @Override @@ -61,17 +59,17 @@ public class FlowableFallback implements FlowableFeign { } @Override - public ResultBean revokeProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl ) { + public ResultBean revokeProcess(com.yxt.supervise.flowable.api.flowtask.FlowTaskVo fl ) { return null; } @Override - public ResultBean taskReject(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl) { + public ResultBean taskReject(com.yxt.supervise.flowable.api.flowtask.FlowTaskVo fl) { return null; } @Override - public ResultBean breakProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl) { + public ResultBean breakProcess(com.yxt.supervise.flowable.api.flowtask.FlowTaskVo fl) { return null; } diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowableFeign.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowableFeign.java index 50eb8b48..ac52e07f 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/FlowableFeign.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.supervise.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; @@ -9,8 +9,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.Map; - @Api(tags = "Flowable") @FeignClient( contextId = "supervise-flowable-Flowable", @@ -106,15 +104,15 @@ public interface FlowableFeign { @ApiOperation(value = "撤回流程") @PostMapping(value = "/revokeProcess") @ResponseBody - ResultBean revokeProcess(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl); + ResultBean revokeProcess(@RequestBody com.yxt.supervise.flowable.api.flowtask.FlowTaskVo fl); @ApiOperation(value = "驳回流程") @PostMapping(value = "/taskReject") @ResponseBody - ResultBean taskReject(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl); + ResultBean taskReject(@RequestBody com.yxt.supervise.flowable.api.flowtask.FlowTaskVo fl); @ApiOperation(value = "终止流程") @PostMapping(value = "/breakProcess") @ResponseBody - ResultBean breakProcess(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl); + ResultBean breakProcess(@RequestBody com.yxt.supervise.flowable.api.flowtask.FlowTaskVo fl); } diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/StartProcessDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/StartProcessDto.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/StartProcessDto.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/StartProcessDto.java index 50a24904..d6c0902c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/StartProcessDto.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/StartProcessDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; import java.util.Map; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/TaskQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/TaskQuery.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/TaskQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/TaskQuery.java index 680660d6..9cca6902 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/TaskQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/TaskQuery.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; import com.yxt.common.core.query.Query; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/UpdateFlowFieldVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/UpdateFlowFieldVo.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/UpdateFlowFieldVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/UpdateFlowFieldVo.java index fbb5b314..b3fcbc3c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/UpdateFlowFieldVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/UpdateFlowFieldVo.java @@ -1,6 +1,4 @@ -package com.yxt.anrui.flowable.api.flow; - -import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +package com.yxt.supervise.flowable.api.flow; public class UpdateFlowFieldVo { diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/UserAndOrgPath.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/UserAndOrgPath.java similarity index 81% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/UserAndOrgPath.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/UserAndOrgPath.java index 1d4d1cf8..05568d5b 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flow/UserAndOrgPath.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow/UserAndOrgPath.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flow; +package com.yxt.supervise.flowable.api.flow; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowcomment/FlowComment.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowcomment/FlowComment.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowcomment/FlowComment.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowcomment/FlowComment.java index ceb9f9f9..e138bed8 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowcomment/FlowComment.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowcomment/FlowComment.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowcomment; +package com.yxt.supervise.flowable.api.flowcomment; /** * @author dimengzhe diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowcomment/FlowCommentDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowcomment/FlowCommentDto.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowcomment/FlowCommentDto.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowcomment/FlowCommentDto.java index 91b80c08..e4ff1fb8 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowcomment/FlowCommentDto.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowcomment/FlowCommentDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowcomment; +package com.yxt.supervise.flowable.api.flowcomment; import lombok.Builder; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowcomment/FlowCommentVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowcomment/FlowCommentVo.java similarity index 90% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowcomment/FlowCommentVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowcomment/FlowCommentVo.java index 7ff5ff52..a7008216 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowcomment/FlowCommentVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowcomment/FlowCommentVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowcomment; +package com.yxt.supervise.flowable.api.flowcomment; import com.yxt.common.core.vo.Vo; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionFeign.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeign.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionFeign.java index 2297ada6..7016b847 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionFeign.java @@ -1,7 +1,5 @@ -package com.yxt.anrui.flowable.api.flowdefinition; +package com.yxt.supervise.flowable.api.flowdefinition; -import com.yxt.anrui.flowable.api.flowtask.FlowTask; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeignBusinessStartDTO.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionFeignBusinessStartDTO.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeignBusinessStartDTO.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionFeignBusinessStartDTO.java index d9f42834..3097a426 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeignBusinessStartDTO.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionFeignBusinessStartDTO.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.api.flowdefinition; +package com.yxt.supervise.flowable.api.flowdefinition; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeignFallBack.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionFeignFallBack.java similarity index 88% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeignFallBack.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionFeignFallBack.java index d8004902..9f08efda 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionFeignFallBack.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionFeignFallBack.java @@ -1,7 +1,5 @@ -package com.yxt.anrui.flowable.api.flowdefinition; +package com.yxt.supervise.flowable.api.flowdefinition; -import com.yxt.anrui.flowable.api.flowtask.FlowTask; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionVo.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionVo.java index 796dca2c..ea121f3f 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowDefinitionVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowDefinitionVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowdefinition; +package com.yxt.supervise.flowable.api.flowdefinition; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowInstanceDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowInstanceDto.java similarity index 87% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowInstanceDto.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowInstanceDto.java index d3b28510..18554164 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowInstanceDto.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowInstanceDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowdefinition; +package com.yxt.supervise.flowable.api.flowdefinition; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowSaveXmlQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowSaveXmlQuery.java similarity index 90% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowSaveXmlQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowSaveXmlQuery.java index 0929c677..a073f8da 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/FlowSaveXmlQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/FlowSaveXmlQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowdefinition; +package com.yxt.supervise.flowable.api.flowdefinition; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/SysUser.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/SysUser.java similarity index 97% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/SysUser.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/SysUser.java index aad9a412..a0027b76 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowdefinition/SysUser.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowdefinition/SysUser.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowdefinition; +package com.yxt.supervise.flowable.api.flowdefinition; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowinstance/FlowInstanceFeign.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceFeign.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowinstance/FlowInstanceFeign.java index 4abcca57..41c23783 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowinstance/FlowInstanceFeign.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.api.flowinstance; +package com.yxt.supervise.flowable.api.flowinstance; -import com.yxt.anrui.flowable.api.flowdefinition.FlowInstanceDto; +import com.yxt.supervise.flowable.api.flowdefinition.FlowInstanceDto; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceFeignFallBack.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowinstance/FlowInstanceFeignFallBack.java similarity index 84% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceFeignFallBack.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowinstance/FlowInstanceFeignFallBack.java index 8778ba6a..42eb83bd 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceFeignFallBack.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowinstance/FlowInstanceFeignFallBack.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.api.flowinstance; +package com.yxt.supervise.flowable.api.flowinstance; -import com.yxt.anrui.flowable.api.flowdefinition.FlowInstanceDto; +import com.yxt.supervise.flowable.api.flowdefinition.FlowInstanceDto; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Component; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowinstance/FlowInstanceVo.java similarity index 90% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowinstance/FlowInstanceVo.java index 9ffa4bc5..385b20e8 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowinstance/FlowInstanceVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowinstance/FlowInstanceVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowinstance; +package com.yxt.supervise.flowable.api.flowinstance; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/AppUserVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/AppUserVo.java similarity index 91% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/AppUserVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/AppUserVo.java index c6b29a03..c055ed8f 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/AppUserVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/AppUserVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/CompleteTaskQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/CompleteTaskQuery.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/CompleteTaskQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/CompleteTaskQuery.java index 15922d4c..4e1cce60 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/CompleteTaskQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/CompleteTaskQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowRecordVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowRecordVo.java similarity index 86% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowRecordVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowRecordVo.java index 8a9a6811..8d085be1 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowRecordVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowRecordVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import java.util.ArrayList; import java.util.List; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTask.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTask.java index e35f1ed7..ef592e04 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTask.java @@ -1,7 +1,7 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.anrui.flowable.api.flowcomment.FlowCommentDto; +import com.yxt.supervise.flowable.api.flowcomment.FlowCommentDto; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskDto.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskDto.java index a0bef39e..f9334ee9 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskDto.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.anrui.flowable.api.flowcomment.FlowCommentDto; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; +import com.yxt.supervise.flowable.api.flowcomment.FlowCommentDto; +import com.yxt.supervise.flowable.api.sysprourl.SysProUrlVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskFeign.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskFeign.java index 5a491ad0..2de439d5 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskFeign.java @@ -1,11 +1,11 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yxt.anrui.flowable.api.flow.UserAndOrgPath; -import com.yxt.anrui.flowable.api.utils.RecordQuery; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; -import com.yxt.anrui.flowable.test.StartProcessInstanceQuery; +import com.yxt.supervise.flowable.api.flow.UserAndOrgPath; +import com.yxt.supervise.flowable.api.utils.RecordQuery; +import com.yxt.supervise.flowable.sqloperationsymbol.BusinessTaskQuery; +import com.yxt.supervise.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.supervise.flowable.test.StartProcessInstanceQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; @@ -15,7 +15,6 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; /** * @author dimengzhe diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeignFallBack.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskFeignFallBack.java similarity index 91% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeignFallBack.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskFeignFallBack.java index 8bb749c8..e151a73f 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeignFallBack.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskFeignFallBack.java @@ -1,19 +1,17 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yxt.anrui.flowable.api.flow.UserAndOrgPath; -import com.yxt.anrui.flowable.api.utils.RecordQuery; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; -import com.yxt.anrui.flowable.test.StartProcessInstanceQuery; +import com.yxt.supervise.flowable.api.flow.UserAndOrgPath; +import com.yxt.supervise.flowable.api.utils.RecordQuery; +import com.yxt.supervise.flowable.sqloperationsymbol.BusinessTaskQuery; +import com.yxt.supervise.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.supervise.flowable.test.StartProcessInstanceQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import feign.Param; import org.flowable.bpmn.model.FlowElement; import org.springframework.stereotype.Component; import java.util.List; -import java.util.Map; /** * @author dimengzhe diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskQuery.java similarity index 91% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskQuery.java index 08c1fa93..ff522848 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskQueryOne.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskQueryOne.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskQueryOne.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskQueryOne.java index d74e908a..500431d1 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskQueryOne.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskQueryOne.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskVo.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskVo.java index 94ac010b..237f823a 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowTaskVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowViewerDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowViewerDto.java similarity index 89% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowViewerDto.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowViewerDto.java index a7459fd6..36ad34d9 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowViewerDto.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/FlowViewerDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import java.io.Serializable; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/LatestTaskVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/LatestTaskVo.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/LatestTaskVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/LatestTaskVo.java index 2defac60..e962cd78 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/LatestTaskVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/LatestTaskVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskQuery.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskQuery.java index e6b7b415..3ef215d0 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskQueryParamsVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskQueryParamsVo.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskQueryParamsVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskQueryParamsVo.java index 64783099..8eaecb86 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskQueryParamsVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskQueryParamsVo.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; -import com.yxt.anrui.flowable.api.utils.ORDERBY; +import com.yxt.supervise.flowable.api.utils.ORDERBY; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskUserInfo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskUserInfo.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskUserInfo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskUserInfo.java index c05dfa87..52695919 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskUserInfo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskUserInfo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; public class TaskUserInfo { private String assigneeName; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskVo.java similarity index 97% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskVo.java index 5a388c4e..6aa0932b 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/TaskVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flowtask/TaskVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.flowtask; +package com.yxt.supervise.flowable.api.flowtask; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessComment.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessComment.java index 73cb5e3a..29365581 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessComment.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessComment.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.api.processcomment; +package com.yxt.supervise.flowable.api.processcomment; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDetailsVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentDetailsVo.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDetailsVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentDetailsVo.java index 311ea5a2..67e69cb3 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDetailsVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentDetailsVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.api.processcomment; +package com.yxt.supervise.flowable.api.processcomment; import com.yxt.common.core.vo.Vo; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentDto.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentDto.java index 08ff5e22..d2df9702 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentDto.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentDto.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.api.processcomment; +package com.yxt.supervise.flowable.api.processcomment; import com.yxt.common.core.dto.Dto; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentFeign.java similarity index 97% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentFeign.java index 119f5ded..bf15562f 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentFeign.java @@ -23,9 +23,8 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.api.processcomment; +package com.yxt.supervise.flowable.api.processcomment; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeignFallback.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentFeignFallback.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeignFallback.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentFeignFallback.java index a4e8687c..26a16eeb 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentFeignFallback.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentFeignFallback.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.api.processcomment; +package com.yxt.supervise.flowable.api.processcomment; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentQuery.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentQuery.java index 13b90162..273982b7 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentQuery.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.api.processcomment; +package com.yxt.supervise.flowable.api.processcomment; import com.yxt.common.core.query.Query; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentVo.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentVo.java index e4dc90a0..3dc16ca2 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/processcomment/ProcessCommentVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/processcomment/ProcessCommentVo.java @@ -23,10 +23,10 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.api.processcomment; +package com.yxt.supervise.flowable.api.processcomment; -import com.yxt.anrui.flowable.api.flowtask.AppUserVo; +import com.yxt.supervise.flowable.api.flowtask.AppUserVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysdeployform/SysDeployForm.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysdeployform/SysDeployForm.java similarity index 81% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysdeployform/SysDeployForm.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysdeployform/SysDeployForm.java index 20347337..43847638 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysdeployform/SysDeployForm.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysdeployform/SysDeployForm.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.api.sysdeployform; +package com.yxt.supervise.flowable.api.sysdeployform; -import com.yxt.anrui.flowable.api.utils.Excel; +import com.yxt.supervise.flowable.api.utils.Excel; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysForm.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysForm.java similarity index 86% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysForm.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysForm.java index 86af5860..1977c150 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysForm.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysForm.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.api.sysform; +package com.yxt.supervise.flowable.api.sysform; -import com.yxt.anrui.flowable.api.utils.Excel; +import com.yxt.supervise.flowable.api.utils.Excel; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormFeign.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormFeign.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormFeign.java index e7c4132e..e49e9409 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormFeign.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.api.sysform; +package com.yxt.supervise.flowable.api.sysform; -import com.yxt.anrui.flowable.api.sysdeployform.SysDeployForm; +import com.yxt.supervise.flowable.api.sysdeployform.SysDeployForm; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormFeignFallBack.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormFeignFallBack.java similarity index 89% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormFeignFallBack.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormFeignFallBack.java index e0b60517..3a7f11c4 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormFeignFallBack.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormFeignFallBack.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.api.sysform; +package com.yxt.supervise.flowable.api.sysform; -import com.yxt.anrui.flowable.api.sysdeployform.SysDeployForm; +import com.yxt.supervise.flowable.api.sysdeployform.SysDeployForm; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormQuery.java similarity index 89% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormQuery.java index 2d0f9a3a..c28ea4da 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysform; +package com.yxt.supervise.flowable.api.sysform; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormVo.java similarity index 90% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormVo.java index 3f898fb9..41d0bccf 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysFormVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysFormVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysform; +package com.yxt.supervise.flowable.api.sysform; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysTaskForm.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysTaskForm.java similarity index 81% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysTaskForm.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysTaskForm.java index 8b788fa7..73c0a62c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysform/SysTaskForm.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysform/SysTaskForm.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.api.sysform; +package com.yxt.supervise.flowable.api.sysform; -import com.yxt.anrui.flowable.api.utils.Excel; +import com.yxt.supervise.flowable.api.utils.Excel; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLink.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLink.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLink.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLink.java index d12416cc..d65db2b0 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLink.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLink.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysformlink; +package com.yxt.supervise.flowable.api.sysformlink; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkDto.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkDto.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkDto.java index b65a4fd1..86bb95d2 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkDto.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysformlink; +package com.yxt.supervise.flowable.api.sysformlink; import com.yxt.common.core.dto.Dto; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkFeign.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFeign.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkFeign.java index 160a0530..d47df412 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkFeign.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysformlink; +package com.yxt.supervise.flowable.api.sysformlink; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFeignFallback.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkFeignFallback.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFeignFallback.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkFeignFallback.java index 8ee3fa33..41557b31 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFeignFallback.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkFeignFallback.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysformlink; +package com.yxt.supervise.flowable.api.sysformlink; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Component; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFlowStateEnum.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkFlowStateEnum.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFlowStateEnum.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkFlowStateEnum.java index 2c139cc8..1ab94d2c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkFlowStateEnum.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkFlowStateEnum.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysformlink; +package com.yxt.supervise.flowable.api.sysformlink; /** * @author liuguohui diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkQuery.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkQuery.java index a9dddf63..7c3aefd0 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysformlink; +package com.yxt.supervise.flowable.api.sysformlink; import com.yxt.common.core.query.Query; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkTypeEnum.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkTypeEnum.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkTypeEnum.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkTypeEnum.java index d88e9a17..a6df53ec 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkTypeEnum.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkTypeEnum.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysformlink; +package com.yxt.supervise.flowable.api.sysformlink; /** * @author liuguohui diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkVo.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkVo.java index eb5dde29..c05e6fd9 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormLinkVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormLinkVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysformlink; +package com.yxt.supervise.flowable.api.sysformlink; import com.yxt.common.core.vo.Vo; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormStateVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormStateVo.java similarity index 90% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormStateVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormStateVo.java index 190e035b..0d888857 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysformlink/SysFormStateVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysformlink/SysFormStateVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysformlink; +package com.yxt.supervise.flowable.api.sysformlink; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/AppSysProUrlQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/AppSysProUrlQuery.java similarity index 91% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/AppSysProUrlQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/AppSysProUrlQuery.java index 363e2579..5c9ee6a6 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/AppSysProUrlQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/AppSysProUrlQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysprourl; +package com.yxt.supervise.flowable.api.sysprourl; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/AppUrlVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/AppUrlVo.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/AppUrlVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/AppUrlVo.java index f4d40da7..5959f7b3 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/AppUrlVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/AppUrlVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysprourl; +package com.yxt.supervise.flowable.api.sysprourl; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/PcUrlVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/PcUrlVo.java similarity index 88% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/PcUrlVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/PcUrlVo.java index e6cafd31..792c1051 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/PcUrlVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/PcUrlVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysprourl; +package com.yxt.supervise.flowable.api.sysprourl; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrl.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrl.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrl.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrl.java index 77670f52..97065849 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrl.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrl.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysprourl; +package com.yxt.supervise.flowable.api.sysprourl; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlDto.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlDto.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlDto.java index 196da35d..51b38048 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlDto.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysprourl; +package com.yxt.supervise.flowable.api.sysprourl; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlFeign.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlFeign.java index 729c4418..73123b0c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlFeign.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysprourl; +package com.yxt.supervise.flowable.api.sysprourl; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlFeignFallBack.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlFeignFallBack.java index d9af05be..cbd71630 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlFeignFallBack.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysprourl; +package com.yxt.supervise.flowable.api.sysprourl; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlQuery.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlQuery.java index e10167b6..edc3c6d5 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysprourl; +package com.yxt.supervise.flowable.api.sysprourl; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlVo.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlVo.java index 1d81dc34..435a66dc 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/sysprourl/SysProUrlVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.sysprourl; +package com.yxt.supervise.flowable.api.sysprourl; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/CharsetKit.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/CharsetKit.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/CharsetKit.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/CharsetKit.java index a036c9ab..120487fe 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/CharsetKit.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/CharsetKit.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.utils; +package com.yxt.supervise.flowable.api.utils; import com.yxt.common.base.utils.StringUtils; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/Convert.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/Convert.java similarity index 99% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/Convert.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/Convert.java index ace74bd2..ac9fcf31 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/Convert.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/Convert.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.utils; +package com.yxt.supervise.flowable.api.utils; import com.yxt.common.base.utils.StringUtils; import org.apache.commons.lang3.ArrayUtils; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/Excel.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/Excel.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/Excel.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/Excel.java index 0ecfca93..472d42c6 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/Excel.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/Excel.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.utils; +package com.yxt.supervise.flowable.api.utils; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ORDERBY.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ORDERBY.java similarity index 81% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ORDERBY.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ORDERBY.java index 787ea730..2d77a087 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ORDERBY.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ORDERBY.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.utils; +package com.yxt.supervise.flowable.api.utils; /** * @author bruce.liu diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ProcDefEnum.java similarity index 99% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ProcDefEnum.java index 41c193b6..1154daf8 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ProcDefEnum.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.utils; +package com.yxt.supervise.flowable.api.utils; /** * 流程定义:流程名称与代号枚举类 diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ProcessStateEnum.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ProcessStateEnum.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ProcessStateEnum.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ProcessStateEnum.java index 1d6badb4..632bf760 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ProcessStateEnum.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ProcessStateEnum.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.utils; +package com.yxt.supervise.flowable.api.utils; /** * @author 10095 diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/RecordQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/RecordQuery.java similarity index 87% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/RecordQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/RecordQuery.java index 8a553b19..eaeae1cd 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/RecordQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/RecordQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.utils; +package com.yxt.supervise.flowable.api.utils; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ServletUtils.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ServletUtils.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ServletUtils.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ServletUtils.java index e7c1bec5..857d94d9 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/ServletUtils.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.utils; +package com.yxt.supervise.flowable.api.utils; import com.yxt.common.base.utils.StringUtils; import org.springframework.web.context.request.RequestAttributes; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/SqlUtil.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/SqlUtil.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/SqlUtil.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/SqlUtil.java index 383b4943..da7e6348 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/utils/SqlUtil.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/utils/SqlUtil.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.api.utils; +package com.yxt.supervise.flowable.api.utils; import com.yxt.common.base.utils.StringUtils; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.java similarity index 78% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.java index b5955863..e7fa6f09 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.flow; +package com.yxt.supervise.flowable.biz.flow; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yxt.anrui.flowable.api.flow.FlowProcinst; -import com.yxt.anrui.flowable.api.flow.Flowable; +import com.yxt.supervise.flowable.api.flow.FlowProcinst; +import com.yxt.supervise.flowable.api.flow.Flowable; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.xml similarity index 90% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.xml index ed11d894..be269af2 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow/FlowableMapper.xml @@ -1,7 +1,7 @@ - - + + insert into `act_ru_task` ( `days`, `zd`,initiator,outcome) VALUES ( @@ -12,7 +12,7 @@ ) - select * from act_hi_procinst where ID_=#{id} - SELECT * FROM process_comment ${ew.sqlSegment} - SELECT * FROM process_comment ${ew.sqlSegment} - select * from process_comment where processId=#{processId} - + insert into `process_comment` ( `sid`, `reviewer`, `reviewerSid`, `time`, `content`, `processId`, `processInstSid`) values(#{sid},#{reviewer},#{reviewerSid},#{time},#{content},#{processId},#{processInstSid}); diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentRest.java similarity index 97% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentRest.java index cb660f5d..97bd4e28 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentRest.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentRest.java @@ -23,12 +23,13 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.biz.processcomment; +package com.yxt.supervise.flowable.biz.processcomment; import com.yxt.anrui.flowable.api.processcomment.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.flowable.api.processcomment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +37,6 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.List; -import java.util.UUID; /** * Project: processcomment(流程评论)
diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentService.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentService.java index 7527bdc5..b31bbee4 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/processcomment/ProcessCommentService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/processcomment/ProcessCommentService.java @@ -23,15 +23,15 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.biz.processcomment; +package com.yxt.supervise.flowable.biz.processcomment; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.flowable.api.flowtask.AppUserVo; -import com.yxt.anrui.flowable.api.flowtask.TaskUserInfo; +import com.yxt.supervise.flowable.api.flowtask.AppUserVo; import com.yxt.anrui.flowable.api.processcomment.*; import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.supervise.flowable.api.processcomment.*; import com.yxt.supervise.system.sysuser.SysUserFeign; import com.yxt.supervise.system.sysuser.SysUserVo; import org.apache.commons.lang3.StringUtils; @@ -44,7 +44,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/service/impl/FlowTaskServiceImpl.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/service/impl/FlowTaskServiceImpl.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/service/impl/FlowTaskServiceImpl.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/service/impl/FlowTaskServiceImpl.java index acec5b60..7869fcd5 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/service/impl/FlowTaskServiceImpl.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/service/impl/FlowTaskServiceImpl.java @@ -1,16 +1,16 @@ -package com.yxt.anrui.flowable.biz.service.impl; +package com.yxt.supervise.flowable.biz.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; -import com.yxt.anrui.flowable.api.flowcomment.FlowCommentDto; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskDto; -import com.yxt.anrui.flowable.api.flowtask.CompleteTaskQuery; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskQuery; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskQueryOne; -import com.yxt.anrui.flowable.api.flowcomment.FlowComment; -import com.yxt.anrui.flowable.factory.FlowServiceFactory; -import com.yxt.anrui.flowable.test.StartProcessInstanceQuery; -import com.yxt.anrui.flowable.utils.FlowableUtils; +import com.yxt.supervise.flowable.api.flowcomment.FlowCommentDto; +import com.yxt.supervise.flowable.api.flowtask.FlowTaskDto; +import com.yxt.supervise.flowable.api.flowtask.CompleteTaskQuery; +import com.yxt.supervise.flowable.api.flowtask.FlowTaskQuery; +import com.yxt.supervise.flowable.api.flowtask.FlowTaskQueryOne; +import com.yxt.supervise.flowable.api.flowcomment.FlowComment; +import com.yxt.supervise.flowable.factory.FlowServiceFactory; +import com.yxt.supervise.flowable.test.StartProcessInstanceQuery; +import com.yxt.supervise.flowable.utils.FlowableUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.system.sysuser.SysUserFeign; @@ -44,7 +44,7 @@ import java.util.*; * @description */ @Service -public class FlowTaskServiceImpl extends FlowServiceFactory { +public class FlowTaskServiceImpl extends FlowServiceFactory { @Autowired private SysUserFeign sysUserFeign; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.java similarity index 90% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.java index 4a4a0db9..6dc469ff 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.sysdeployform; +package com.yxt.supervise.flowable.biz.sysdeployform; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysdeployform.SysDeployForm; +import com.yxt.supervise.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysdeployform.SysDeployForm; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.xml similarity index 79% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.xml index b4748b5c..2ebc7a93 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, form_id, deploy_id from sys_deploy_form - and form_id = #{formId} @@ -27,12 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - select t1.form_content as formContent,t1.form_name as formName,t1.id as id from sys_form t1 left join sys_deploy_form t2 on t1.id = t2.form_id where t2.deploy_id = #{deployId} - + insert into sys_deploy_form form_id, @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_deploy_form form_id = #{formId}, diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormService.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormService.java index ce7b85fb..1f1a3266 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysdeployform/SysDeployFormService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysdeployform/SysDeployFormService.java @@ -1,7 +1,7 @@ -package com.yxt.anrui.flowable.biz.sysdeployform; +package com.yxt.supervise.flowable.biz.sysdeployform; -import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysdeployform.SysDeployForm; +import com.yxt.supervise.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysdeployform.SysDeployForm; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormController.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormController.java similarity index 87% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormController.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormController.java index a9fa16b6..cdc0741c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormController.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormController.java @@ -1,13 +1,13 @@ -package com.yxt.anrui.flowable.biz.sysform; +package com.yxt.supervise.flowable.biz.sysform; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.flowable.api.sysform.SysFormFeign; -import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysform.SysFormQuery; -import com.yxt.anrui.flowable.api.sysdeployform.SysDeployForm; -import com.yxt.anrui.flowable.api.sysform.SysFormVo; -import com.yxt.anrui.flowable.biz.sysdeployform.SysDeployFormService; +import com.yxt.supervise.flowable.api.sysform.SysFormFeign; +import com.yxt.supervise.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysform.SysFormQuery; +import com.yxt.supervise.flowable.api.sysdeployform.SysDeployForm; +import com.yxt.supervise.flowable.api.sysform.SysFormVo; +import com.yxt.supervise.flowable.biz.sysdeployform.SysDeployFormService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.java index 7a33ad96..d28557bf 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.java @@ -1,12 +1,12 @@ -package com.yxt.anrui.flowable.biz.sysform; +package com.yxt.supervise.flowable.biz.sysform; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysform.SysFormVo; +import com.yxt.supervise.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysform.SysFormVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.xml similarity index 77% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.xml index cce1e070..a935520e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormMapper.xml @@ -1,7 +1,7 @@ - - select id as formId, form_name as formName, form_content as formContent from sys_form @@ -10,7 +10,7 @@ select count(*) as total from sys_form - + insert into sys_form form_name, @@ -27,7 +27,7 @@ #{formId} - select id as formId, form_name as formName, form_content as formContent, remark as remarks from sys_form where id = #{formId} diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormService.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormService.java index a16ee00a..fde2487e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysform/SysFormService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysform/SysFormService.java @@ -1,11 +1,11 @@ -package com.yxt.anrui.flowable.biz.sysform; +package com.yxt.supervise.flowable.biz.sysform; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yxt.anrui.flowable.api.sysform.SysForm; -import com.yxt.anrui.flowable.api.sysform.SysFormQuery; -import com.yxt.anrui.flowable.api.sysform.SysFormVo; +import com.yxt.supervise.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysform.SysFormQuery; +import com.yxt.supervise.flowable.api.sysform.SysFormVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import org.apache.commons.lang3.StringUtils; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.java similarity index 85% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.java index 59c3a25c..4a8b466e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.sysformlink; +package com.yxt.supervise.flowable.biz.sysformlink; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLink; -import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; +import com.yxt.supervise.flowable.api.sysformlink.SysFormLink; +import com.yxt.supervise.flowable.api.sysformlink.SysFormStateVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.xml similarity index 78% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.xml index 96301335..87f5cad2 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkMapper.xml @@ -1,7 +1,7 @@ - - + + insert into sys_form_link(sid, businessSid, procInsId, taskDefKey, nodeState, flowState, formType) values (#{sid},#{businessSid},#{procInsId},#{taskDefKey},#{nodeState},#{flowState},#{formType}) diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkRest.java similarity index 86% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkRest.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkRest.java index 765cfa75..9a51d7ac 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkRest.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkRest.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.sysformlink; +package com.yxt.supervise.flowable.biz.sysformlink; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; -import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; +import com.yxt.supervise.flowable.api.sysformlink.SysFormLinkDto; +import com.yxt.supervise.flowable.api.sysformlink.SysFormLinkFeign; +import com.yxt.supervise.flowable.api.sysformlink.SysFormStateVo; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkService.java similarity index 90% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkService.java index 7aeff439..93483e22 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysformlink/SysFormLinkService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysformlink/SysFormLinkService.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.sysformlink; +package com.yxt.supervise.flowable.biz.sysformlink; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLink; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; -import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; +import com.yxt.supervise.flowable.api.sysformlink.SysFormLink; +import com.yxt.supervise.flowable.api.sysformlink.SysFormLinkDto; +import com.yxt.supervise.flowable.api.sysformlink.SysFormStateVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlController.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlController.java index 839eb5b5..fce99932 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlController.java @@ -1,14 +1,15 @@ -package com.yxt.anrui.flowable.biz.sysprourl; +package com.yxt.supervise.flowable.biz.sysprourl; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.flowable.api.sysdeployform.SysDeployForm; -import com.yxt.anrui.flowable.api.sysform.SysForm; +import com.yxt.supervise.flowable.api.sysdeployform.SysDeployForm; +import com.yxt.supervise.flowable.api.sysform.SysForm; import com.yxt.anrui.flowable.api.sysprourl.*; -import com.yxt.anrui.flowable.biz.sysdeployform.SysDeployFormService; +import com.yxt.supervise.flowable.biz.sysdeployform.SysDeployFormService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.flowable.api.sysprourl.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.java similarity index 91% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.java index 8574a668..e12f7f49 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.java @@ -1,13 +1,13 @@ -package com.yxt.anrui.flowable.biz.sysprourl; +package com.yxt.supervise.flowable.biz.sysprourl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrl; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrlQuery; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; +import com.yxt.supervise.flowable.api.sysprourl.SysProUrl; +import com.yxt.supervise.flowable.api.sysprourl.SysProUrlQuery; +import com.yxt.supervise.flowable.api.sysprourl.SysProUrlVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.xml similarity index 83% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.xml index 4e14b1d8..744165ea 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlMapper.xml @@ -1,7 +1,7 @@ - - select id as id, url as url, type as type, terminal as terminal, formId as formId, title as title from sys_pro_url @@ -9,7 +9,7 @@ select count(*) as total from sys_pro_url - insert into sys_pro_url @@ -81,13 +81,13 @@ - SELECT url, type, terminal, @@ -102,8 +102,8 @@ ORDER BY terminal DESC, id ASC - SELECT url, modulePluginName FROM sys_pro_url WHERE proc_def_id = #{proc_def_id} @@ -112,7 +112,7 @@ AND taskDefKey = #{taskDefKey} - select * from sys_pro_url where proc_def_id = #{procDefId} diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlService.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlService.java index d87517e9..88d60645 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/sysprourl/SysProUrlService.java @@ -1,7 +1,6 @@ -package com.yxt.anrui.flowable.biz.sysprourl; +package com.yxt.supervise.flowable.biz.sysprourl; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -9,10 +8,10 @@ import com.yxt.anrui.flowable.api.sysprourl.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.flowable.api.sysprourl.*; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.List; /** diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.java index a52a4224..5ce04376 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.biz.systaskform; +package com.yxt.supervise.flowable.biz.systaskform; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yxt.anrui.flowable.api.sysform.SysTaskForm; +import com.yxt.supervise.flowable.api.sysform.SysTaskForm; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.xml similarity index 77% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.xml rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.xml index 0302700c..f4569271 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/systaskform/SysTaskFormMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/systaskform/SysTaskFormMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, form_id, task_id from sys_task_form - and form_id = #{formId} @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into sys_task_form form_id, @@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_task_form form_id = #{formId}, diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/EnumResultBean.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/EnumResultBean.java similarity index 98% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/EnumResultBean.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/EnumResultBean.java index c9e75f63..882464d8 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/EnumResultBean.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/EnumResultBean.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.flowable.common; +package com.yxt.supervise.flowable.common; import com.yxt.common.core.constant.HttpStatus; import com.yxt.common.core.result.ResultBean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/ProcessConstants.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/ProcessConstants.java similarity index 97% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/ProcessConstants.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/ProcessConstants.java index a541c73b..756ed499 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/common/ProcessConstants.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/common/ProcessConstants.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.common; +package com.yxt.supervise.flowable.common; /** * @author dimengzhe diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramCanvasExt.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramCanvasExt.java similarity index 99% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramCanvasExt.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramCanvasExt.java index 79552fdb..10788046 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramCanvasExt.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramCanvasExt.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import org.flowable.bpmn.model.AssociationDirection; import org.flowable.bpmn.model.GraphicInfo; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramGeneratorExt.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramGeneratorExt.java similarity index 99% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramGeneratorExt.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramGeneratorExt.java index da79a3ea..2c78c809 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DefaultProcessDiagramGeneratorExt.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DefaultProcessDiagramGeneratorExt.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import org.flowable.bpmn.model.*; import org.flowable.bpmn.model.Process; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DiRemoteAccountResource.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DiRemoteAccountResource.java similarity index 97% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DiRemoteAccountResource.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DiRemoteAccountResource.java index 2f3d4910..91a0376a 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/DiRemoteAccountResource.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/DiRemoteAccountResource.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import org.flowable.idm.engine.impl.persistence.entity.UserEntityImpl; import org.flowable.ui.common.model.UserRepresentation; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableConfig.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/FlowableConfig.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableConfig.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/FlowableConfig.java index 54215cdd..ed7f381a 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableConfig.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/FlowableConfig.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import org.flowable.spring.SpringProcessEngineConfiguration; import org.flowable.spring.boot.EngineConfigurationConfigurer; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/P6spySqlFormatConfig.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/P6spySqlFormatConfig.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/P6spySqlFormatConfig.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/P6spySqlFormatConfig.java index bae30c1c..b332ce80 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/P6spySqlFormatConfig.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/P6spySqlFormatConfig.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import com.p6spy.engine.spy.appender.MessageFormattingStrategy; import com.yxt.common.base.utils.DateUtils; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/ProcessEngineConfig.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/ProcessEngineConfig.java similarity index 99% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/ProcessEngineConfig.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/ProcessEngineConfig.java index 49ca8bdb..e3d4ca03 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/ProcessEngineConfig.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/ProcessEngineConfig.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import liquibase.Liquibase; import liquibase.database.Database; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/Swagger2Config.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/Swagger2Config.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/Swagger2Config.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/Swagger2Config.java index b9d42153..2fac462c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/Swagger2Config.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/config/Swagger2Config.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.config; +package com.yxt.supervise.flowable.config; import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import org.springframework.context.annotation.Bean; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/exception/CustomException.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/exception/CustomException.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/exception/CustomException.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/exception/CustomException.java index 3ca7810a..d0fe616d 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/exception/CustomException.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/exception/CustomException.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.exception; +package com.yxt.supervise.flowable.exception; /** * 自定义异常 diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/factory/FlowServiceFactory.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/factory/FlowServiceFactory.java similarity index 95% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/factory/FlowServiceFactory.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/factory/FlowServiceFactory.java index 7bfc8a4c..291a5b80 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/factory/FlowServiceFactory.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/factory/FlowServiceFactory.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.factory; +package com.yxt.supervise.flowable.factory; import org.flowable.engine.*; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/BaseVehicleExecutionListener.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/BaseVehicleExecutionListener.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/BaseVehicleExecutionListener.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/BaseVehicleExecutionListener.java index 9d7494a2..2e4747d6 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/BaseVehicleExecutionListener.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/BaseVehicleExecutionListener.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.listener; +package com.yxt.supervise.flowable.listener; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerEndExecutionListener.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerEndExecutionListener.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerEndExecutionListener.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerEndExecutionListener.java index b8d567bc..4eee0729 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerEndExecutionListener.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerEndExecutionListener.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.listener; +package com.yxt.supervise.flowable.listener; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerTaskListener.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerTaskListener.java similarity index 89% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerTaskListener.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerTaskListener.java index 21426e9e..d367ac42 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/listener/ManagerTaskListener.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/listener/ManagerTaskListener.java @@ -1,22 +1,14 @@ -package com.yxt.anrui.flowable.listener; +package com.yxt.supervise.flowable.listener; import com.alibaba.fastjson.JSONObject; -import com.yxt.common.base.utils.JPushServer; -import com.yxt.common.core.result.ResultBean; //import com.yxt.supervise.system.sysuserrole.SysUserRoleFeign; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.delegate.TaskListener; import org.flowable.identitylink.api.IdentityLink; import org.flowable.task.service.delegate.DelegateTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.kafka.core.KafkaTemplate; -import org.springframework.kafka.support.SendResult; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; -import org.springframework.util.concurrent.ListenableFuture; -import org.springframework.util.concurrent.ListenableFutureCallback; import javax.annotation.PostConstruct; import java.util.List; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskParam.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskParam.java similarity index 93% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskParam.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskParam.java index 0d8e1a1f..37eb1341 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskParam.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskParam.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.sqloperationsymbol; +package com.yxt.supervise.flowable.sqloperationsymbol; import lombok.Data; /** diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskQuery.java similarity index 91% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskQuery.java index 95b717cf..775030de 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessTaskQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessTaskQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.sqloperationsymbol; +package com.yxt.supervise.flowable.sqloperationsymbol; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessVariables.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessVariables.java index 811bb993..2650de6d 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/BusinessVariables.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.sqloperationsymbol; +package com.yxt.supervise.flowable.sqloperationsymbol; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/SQLOperationSymbol.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/SQLOperationSymbol.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/SQLOperationSymbol.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/SQLOperationSymbol.java index 05b3275d..5da9e5db 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/SQLOperationSymbol.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/sqloperationsymbol/SQLOperationSymbol.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.sqloperationsymbol; +package com.yxt.supervise.flowable.sqloperationsymbol; /** * sql语句运算符号,“=”,“like”,"in",">","<" diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/FlowCommentVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/FlowCommentVo.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/FlowCommentVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/FlowCommentVo.java index 7c4494f9..efe296a4 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/FlowCommentVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/FlowCommentVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.test; +package com.yxt.supervise.flowable.test; import com.yxt.common.core.vo.Vo; import lombok.Builder; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayTestApi.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayTestApi.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayTestApi.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayTestApi.java index b56c9396..e0ea6ca8 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayTestApi.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayTestApi.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.test; +package com.yxt.supervise.flowable.test; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayVo.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayVo.java similarity index 92% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayVo.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayVo.java index e0fc4f0b..96236687 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/HolidayVo.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/HolidayVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.test; +package com.yxt.supervise.flowable.test; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/StartProcessInstanceQuery.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/StartProcessInstanceQuery.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/StartProcessInstanceQuery.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/StartProcessInstanceQuery.java index 55cc4d84..0b54bc89 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/StartProcessInstanceQuery.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/StartProcessInstanceQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.test; +package com.yxt.supervise.flowable.test; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/HolidayTestController.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/HolidayTestController.java similarity index 86% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/HolidayTestController.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/HolidayTestController.java index de92b4bc..98f7756e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/HolidayTestController.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/HolidayTestController.java @@ -1,8 +1,8 @@ -package com.yxt.anrui.flowable.test.controller; +package com.yxt.supervise.flowable.test.controller; -import com.yxt.anrui.flowable.test.HolidayTestApi; -import com.yxt.anrui.flowable.test.HolidayVo; -import com.yxt.anrui.flowable.test.service.IHolidayTestService; +import com.yxt.supervise.flowable.test.HolidayTestApi; +import com.yxt.supervise.flowable.test.HolidayVo; +import com.yxt.supervise.flowable.test.service.IHolidayTestService; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/TestController.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/TestController.java similarity index 96% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/TestController.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/TestController.java index d068cea3..5e50f876 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/controller/TestController.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/controller/TestController.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.test.controller; +package com.yxt.supervise.flowable.test.controller; import org.flowable.engine.ProcessEngine; import org.flowable.engine.ProcessEngineConfiguration; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/IHolidayTestService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/IHolidayTestService.java similarity index 87% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/IHolidayTestService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/IHolidayTestService.java index 22586bf5..4445d8cb 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/IHolidayTestService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/IHolidayTestService.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.flowable.test.service; +package com.yxt.supervise.flowable.test.service; -import com.yxt.anrui.flowable.test.HolidayVo; +import com.yxt.supervise.flowable.test.HolidayVo; import javax.servlet.http.HttpServletResponse; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/impl/HolidayTestService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/impl/HolidayTestService.java similarity index 94% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/impl/HolidayTestService.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/impl/HolidayTestService.java index 6fb6aef6..e6c6f502 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/test/service/impl/HolidayTestService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/test/service/impl/HolidayTestService.java @@ -1,10 +1,10 @@ -package com.yxt.anrui.flowable.test.service.impl; +package com.yxt.supervise.flowable.test.service.impl; -import com.yxt.anrui.flowable.CodeMsgEnum; -import com.yxt.anrui.flowable.config.DefaultProcessDiagramGeneratorExt; -import com.yxt.anrui.flowable.factory.FlowServiceFactory; -import com.yxt.anrui.flowable.test.HolidayVo; -import com.yxt.anrui.flowable.test.service.IHolidayTestService; +import com.yxt.supervise.flowable.CodeMsgEnum; +import com.yxt.supervise.flowable.config.DefaultProcessDiagramGeneratorExt; +import com.yxt.supervise.flowable.factory.FlowServiceFactory; +import com.yxt.supervise.flowable.test.HolidayVo; +import com.yxt.supervise.flowable.test.service.IHolidayTestService; import com.yxt.common.core.result.ResultBean; import org.apache.commons.io.IOUtils; import org.flowable.bpmn.model.BpmnModel; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/utils/FlowableUtils.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/utils/FlowableUtils.java similarity index 99% rename from yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/utils/FlowableUtils.java rename to yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/utils/FlowableUtils.java index f8feca25..e9434882 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/utils/FlowableUtils.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/utils/FlowableUtils.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.flowable.utils; +package com.yxt.supervise.flowable.utils; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.*; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/spy.properties b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/spy.properties index c6b06891..410b499c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/spy.properties +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/spy.properties @@ -1,7 +1,7 @@ # 自带的日志格式 (default is com.p6spy.engine.spy.appender.FileLogger) appender=com.p6spy.engine.spy.appender.Slf4JLogger # 自定义日志打印 -logMessageFormat=com.yxt.anrui.flowable.config.P6spySqlFormatConfig +logMessageFormat=com.yxt.supervise.flowable.config.P6spySqlFormatConfig # 是否开启慢SQL记录 outagedetection=true # 慢SQL记录标准 秒