diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowDefinitionFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowDefinitionFeign.java deleted file mode 100644 index 5acf5a414b965df416a295ec15d5494d77399650..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowDefinitionFeign.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.mortals.xhx.feign.flowable; - -import com.mortals.xhx.feign.IFeign; -import com.mortals.xhx.feign.req.BaseFlowReq; -import com.mortals.xhx.feign.req.BaseQuery; -import com.mortals.xhx.feign.req.DefinitionReq; -import com.mortals.xhx.feign.rsp.ApiResp; -import com.mortals.xhx.feign.rsp.DefinitionDeployRsp; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 宸ヤ綔娴佺▼璁块棶 - * - * @author: zxfei - * @date: 2021/8/31 9:34 - */ -@FeignClient(name = "workflow-manager",path = "/m") -public interface IApiFlowDefinitionFeign extends IFeign { - - /** - * 娴佺▼閮ㄧ讲鍒楄〃鏌ヨ - * - * @param req - * @return - */ - @PostMapping("/api/definition/deploy/list") - ApiResp<DefinitionDeployRsp> deploymentsList(@RequestBody BaseFlowReq<BaseQuery> req); - - - /** - * 婵€娲绘垨鎸傝捣娴佺▼瀹氫箟(宸茬粡閮ㄧ讲) - * - * @param req - * @return - */ - @PostMapping("/api/definition/deploy/updateState") - ApiResp<String> updateState(@RequestBody DefinitionReq req); - - /** - * 婵€娲绘垨鎸傝捣娴佺▼瀹氫箟(宸茬粡閮ㄧ讲) - * - * @param req - * @return - */ - @PostMapping("/api/definition/deploy/readXml") - ApiResp<String> readXml(@RequestBody DefinitionReq req); - - - - - -} \ No newline at end of file diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowFeign.java deleted file mode 100644 index 41edbe387d3ea8b5d3156af948a20a8a76ac9bfc..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowFeign.java +++ /dev/null @@ -1,194 +0,0 @@ -package com.mortals.xhx.feign.flowable; - -import com.mortals.framework.exception.AppException; -import com.mortals.xhx.common.pdu.api.ApiRespPdu; -import com.mortals.xhx.common.pdu.sms.SmsSendReq; -import com.mortals.xhx.feign.IFeign; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** - * 宸ヤ綔娴乤pi - */ -@FeignClient(name = "government-flowable",path = "/m") -public interface IApiFlowFeign extends IFeign { - - - /** - * 娴佺▼閮ㄧ讲 - * - * @param modelId 娴佺▼ID锛屾潵鑷� ACT_DE_MODEL - * @return - * @throws AppException - */ - @PostMapping(value = "/flowable/api/deploy") - ApiRespPdu<String> deploy(@RequestParam("modelId") String modelId) throws AppException; - - /** - * 鍚姩娴佺▼ - * - * @param deployId 閮ㄧ讲鐨勬祦绋� Id锛屾潵鑷� ACT_RE_PROCDEF - * @param userId 鐢ㄦ埛 Id - * @param dataKey 鏁版嵁 Key锛屼笟鍔¢敭锛屼竴鑸负琛ㄥ崟鏁版嵁鐨� ID锛屼粎浣滀负琛ㄥ崟鏁版嵁涓庢祦绋嬪疄渚嬪叧鑱旂殑渚濇嵁 - * @return - * @throws AppException - */ - @PostMapping(value = "/flowable/api/start") - ApiRespPdu<String> start(@RequestParam(value = "deployId") String deployId, @RequestParam(value = "userId") String userId, @RequestParam(value = "dataKey") String dataKey); - - - /** - * 璁剧疆浠诲姟鍙傛暟 - * - * @param taskId 浠诲姟ID - * @param map 鐢ㄦ埛鍒楄〃 - * @return - */ - @RequestMapping(value = "/flowable/api/setVariables", method = RequestMethod.POST) - ApiRespPdu<String> setVariables(@RequestParam(value = "taskId") String taskId, @RequestBody Map<String, Object> map); - - - /** - * 璁剧疆浠诲姟鍙傛暟 - * - * @param taskId 浠诲姟ID - * @param key 閿� - * @param value 鍊� - * @return - */ - @RequestMapping(value = "/setVariable", method = RequestMethod.POST) - ApiRespPdu<String> setVariable(@RequestParam(value = "taskId") String taskId, - @RequestParam(value = "key") String key, - @RequestParam(value = "value") Object value); - - - /** - * 璁剧疆浠诲姟鍙傛暟锛孡ist 浣跨敤 - * - * @param taskId 浠诲姟ID - * @param key 閿� - * @param value 鍊� - * @return - */ - @RequestMapping(value = "/flowable/api/setListVariable", method = RequestMethod.POST) - ApiRespPdu<String> setListVariable(@RequestParam(value = "taskId") String taskId, - @RequestParam(value = "key") String key, - @RequestParam(value = "value") List<String> value); - - - /** - * 浠诲姟澶勭悊1 - * - * @param taskId 浠诲姟 Id锛屾潵鑷� ACT_RU_TASK - * @return - */ - @RequestMapping(value = "/flowable/api/task", method = RequestMethod.POST) - ApiRespPdu<String> task(@RequestParam(value = "taskId") String taskId); - - - /** - * 浠诲姟澶勭悊 - * - * @param taskId 浠诲姟 Id锛屾潵鑷� ACT_RU_TASK - * @param assignee 璁剧疆瀹℃牳浜猴紝鏇挎崲 - * @param map 瀹屾垚浠诲姟闇€瑕佺殑鏉′欢鍙傛暟 - * @return - */ - @RequestMapping(value = "/flowable/api/taskByAssignee", method = RequestMethod.POST) - ApiRespPdu<String> taskByAssignee(@RequestParam(value = "taskId") String taskId, - @RequestParam(value = "assignee") String assignee, - @RequestBody Map<String, Object> map); - - - /** - * 涓娴佺▼ - * - * @param processId 娴佺▼ID - * @return - */ - @RequestMapping(value = "/flowable/api/deleteProcess", method = RequestMethod.POST) - ApiRespPdu<String> deleteProcess(@RequestParam(value = "processId") String processId); - - - /** - * 鑾峰彇姝e湪杩愯鐨勬暟鎹� Id 鍒楄〃 - * - * @return - */ - @RequestMapping(value = "/flowable/api/getRuntimeDataId", method = RequestMethod.POST) - ApiRespPdu<List<String>> getRuntimeDataId(); - - - /** - * 鏍规嵁鐢ㄦ埛锛岃幏鍙栭渶瑕佸鏍哥殑涓氬姟閿� business_key 鍒楄〃 - * - * @param userId 鐢ㄦ埛 Id - * @return - */ - @RequestMapping(value = "/flowable/api/getRuntimeBusinessKeyByUser", method = RequestMethod.POST) - ApiRespPdu<List<Map<String, Object>>> getRuntimeBusinessKeyByUser(@RequestParam(value = "userId") String userId); - - - /** - * 鑾峰彇缁勶紝鑾峰彇闇€瑕佸鏍哥殑涓氬姟閿� business_key 鍒楄〃 - * - * @param groupIds 缁� Id - * @return - */ - @RequestMapping(value = "/flowable/api/getRuntimeBusinessKeyByGroup", method = RequestMethod.POST) - ApiRespPdu<List<Map<String, Object>>> getRuntimeBusinessKeyByGroup(@RequestBody List<String> groupIds); - - - /** - * 鑾峰彇鐢ㄦ埛瀹℃牳鍘嗗彶 - * - * @param userId 鍙戣捣浜� Id - * @return - */ - @RequestMapping(value = "/flowable/api/getHistoryByUser", method = RequestMethod.POST) - ApiRespPdu<List<Map<String, Object>>> getHistoryByUser(@RequestParam(value = "userId") String userId); - - - /** - * 閫氳繃娴佺▼瀹炰緥 Id锛屽垽鏂祦绋嬫槸鍚︾粨鏉� - * - * @param processInstanceId 娴佺▼瀹炰緥 Id - * @return true 缁撴潫锛宖alse 鏈粨鏉� - */ - @RequestMapping(value = "/flowable/api/checkProcessInstanceFinish", method = RequestMethod.POST) - ApiRespPdu<Boolean> checkProcessInstanceFinish(@RequestParam(value = "processInstanceId") String processInstanceId); - - - /** - * 鏍规嵁浠诲姟鑺傜偣鑾峰彇娴佺▼瀹炰緥 Id - * - * @param taskId 浠诲姟鑺傜偣 Id - * @return - */ - @RequestMapping(value = "/flowable/api/getTaskInfo", method = RequestMethod.POST) - ApiRespPdu<String> getTaskInfo(@RequestParam(value = "taskId") String taskId); - - /** - * 鏍规嵁娴佺▼瀹炰緥 ID 鑾峰彇浠诲姟杩涘害娴佺▼鍥� - * - * @param processInstanceId 娴佺▼瀹炰緥id - * @return base64鍥剧墖鏁版嵁 - * @throws AppException - */ - @RequestMapping(value = "/flowable/api/getProcessDiagram", method = RequestMethod.POST) - String getProcessDiagram(@RequestParam("processInstanceId") String processInstanceId); - - - /** - * 鏍规嵁浠诲姟 ID 鑾峰彇浠诲姟杩涘害娴佺▼鍥� - * - * @param taskId 浠诲姟鑺傜偣 Id - * @return - */ - @RequestMapping(value = "/flowable/api/getTaskProcessDiagram", method = RequestMethod.POST) - ApiRespPdu<String> getTaskProcessDiagram(@RequestParam(value = "taskId") String taskId); -} - diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowInstanceFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowInstanceFeign.java deleted file mode 100644 index 19678f5fda57c5593fa5c1e8162044eb7d683919..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowInstanceFeign.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.mortals.xhx.feign.flowable; - -import com.mortals.xhx.common.pdu.api.ApiRespPdu; -import com.mortals.xhx.common.pdu.flow.FlowTaskVoPdu; -import com.mortals.xhx.common.pdu.flow.FlowViewerPdu; -import com.mortals.xhx.feign.IFeign; -import com.mortals.xhx.feign.processinstance.ProcessCommonReq; -import com.mortals.xhx.feign.processinstance.ProcessDeleteReq; -import com.mortals.xhx.feign.processinstance.ProcessStopReq; -import com.mortals.xhx.feign.processinstance.ProcessUpdateStateReq; -import com.mortals.xhx.feign.rsp.ApiResp; -import com.mortals.xhx.feign.runtime.StartProcessInstanceReq; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; -import java.util.Map; - -/** - * 宸ヤ綔娴佹祦绋嬪疄渚� - * - * @author: finegirl - * @date: 2021/7/31 19:52 - */ -@FeignClient(name = "workflow-manager",path = "/m") -public interface IApiFlowInstanceFeign extends IFeign { - - /** - * 鍚姩娴佺▼ - * - * @param req - * @return - */ - @PostMapping("/api/flow/process/start") - ApiResp<String> processStart(@RequestBody StartProcessInstanceReq req); - - /** - * 婵€娲绘垨鎸傝捣娴佺▼瀹炰緥 - * - * @param req - * @return - */ - @PostMapping("/api/flow/process/updateState") - ApiResp updateState(@RequestBody ProcessUpdateStateReq req); - - /** - * 缁堟娴佺▼ - * - * @param req - * @return - */ - @PostMapping("/api/flow/process/stop") - ApiResp<String> stopProcess(@RequestBody ProcessStopReq req); - - /** - * 鍒犻櫎娴佺▼ - * - * @param req - * @return - */ - @PostMapping("/api/flow/process/delete") - ApiResp<String> deleteProcess(@RequestBody ProcessDeleteReq req); - - - /** - * 鑾峰彇娴佺▼鎵ц杩囩▼ - * - * @param req - * @return - */ - @PostMapping("/api/flow/process/getFlowViewer") - ApiResp<List<FlowViewerPdu>> getFlowViewer(@RequestBody ProcessCommonReq req); - - - /** - * 鏍规嵁娴佺▼瀹炰緥ID 鑾峰彇褰撳墠娴佺▼杩愯鎯呭喌 杩斿洖BASE64鍥剧墖 - * - * @param req - * @return base64鍥剧墖鏁版嵁 - */ - @PostMapping("/api/flow/process/getImage") - ApiResp<String> processReadImage(@RequestBody ProcessCommonReq req); - - - @PostMapping("/api/flow/process/getAllProcessInstanceEl") - ApiResp<List<FlowTaskVoPdu>> getAllProcessInstanceEl(@RequestBody StartProcessInstanceReq req); - -} \ No newline at end of file diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowTaskFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowTaskFeign.java deleted file mode 100644 index abefb1bf748cbb5f01a07ad73d473d69fd854ff2..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/flowable/IApiFlowTaskFeign.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.mortals.xhx.feign.flowable; - -import com.mortals.xhx.common.pdu.flow.FlowNextPdu; -import com.mortals.xhx.common.pdu.flow.FlowUserTaskPdu; -import com.mortals.xhx.feign.IFeign; -import com.mortals.xhx.feign.req.BaseFlowReq; -import com.mortals.xhx.feign.req.BaseQuery; -import com.mortals.xhx.feign.rsp.ApiResp; -import com.mortals.xhx.feign.rsp.TaskRsp; -import com.mortals.xhx.feign.task.*; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; -import java.util.Map; - -/** - * 宸ヤ綔娴佷换鍔$鐞� - * - * @author: finegirl - * @date: 2021/7/31 19:52 - */ -@FeignClient(name = "workflow-manager",path = "/m") -public interface IApiFlowTaskFeign extends IFeign { - - /** - * 鎴戝彂璧风殑娴佺▼ - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/myProcess") - ApiResp<TaskRsp> myProcess(@RequestBody BaseFlowReq<BaseQuery> req); - - - /** - * 鑾峰彇寰呭姙鍒楄〃 - * 鑾峰彇鐨勫垪琛ㄩ渶瑕佸拰涓氬姟绯荤粺鏁版嵁鍚堝苟 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/todoList") - ApiResp<TaskRsp> todoList(@RequestBody BaseFlowReq<BaseQuery> req); - - - /** - * 鑾峰彇宸插姙浠诲姟 - * 鑾峰彇鐨勫垪琛ㄩ渶瑕佸拰涓氬姟绯荤粺鏁版嵁鍚堝苟 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/finishedList") - ApiResp<TaskRsp> finishedList(@RequestBody BaseFlowReq<BaseQuery> req); - - - /** - * 娴佺▼鍘嗗彶娴佽浆璁板綍 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/flowRecord") - ApiResp<TaskRsp> flowRecord(@RequestBody BaseFlowReq<BaseQuery> req); - - - /** - * 鑾峰彇娴佺▼鍙橀噺 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/processVariables") - ApiResp<Map<String, Object>> processVariables(@RequestBody CommonTaskReq req); - - - - /** - * 璁剧疆娴佺▼鍙橀噺 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/setProcessVariables") - ApiResp<Map<String, Object>> setProcessVariables(@RequestBody CommonTaskReq req); - - - - /** - * 鎾ゅ洖娴佺▼ - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/revokeProcess") - ApiResp revokeProcess(@RequestBody RevokeTaskReq req); - - /** - * 鍙栨秷鐢宠 - * - * @param commonTaskReq - * @return - */ - @PostMapping("/api/flow/task/stopProcess") - ApiResp stopProcess(@RequestBody CommonTaskReq commonTaskReq); - - /** - * 瀹℃壒浠诲姟 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/complete") - ApiResp<String> complete(@RequestBody CompleteTaskReq req); - - - /** - * 椹冲洖浠诲姟 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/reject") - ApiResp<String> reject(@RequestBody RejectTaskReq req); - - - /** - * 閫€鍥炰换鍔� - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/return") - ApiResp<String> taskReturn(@RequestBody ReturnTaskReq req); - - - /** - * 鍒犻櫎浠诲姟 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/delete") - ApiResp<String> delete(@RequestBody DeleteTaskReq req); - - /** - * 濮旀淳浠诲姟 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/delegate") - ApiResp<String> delegateTask(@RequestBody DelegateTaskReq req); - - /** - * 杞姙浠诲姟 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/assign") - ApiResp<String> assignTask(@RequestBody TurnTaskReq req); - - - /** - * 鍔犵浠诲姟 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/addSign") - ApiResp<String> addSignTask(@RequestBody AddSignTaskReq req); - - /** - * 鑾峰彇鎵€鏈夊彲鍥為€€鐨勮妭鐐� - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/findReturnTaskList") - ApiResp<List<FlowUserTaskPdu>> findReturnTaskList(@RequestBody CommonTaskReq req); - - - /** - * 鑾峰彇涓嬩竴鑺傜偣 - * - * @param req - * @return - */ - @PostMapping("/api/flow/task/nextFlowNode") - ApiResp<FlowNextPdu> nextFlowNode(@RequestBody CommonTaskReq req); -} - diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/InstanceQueryParamsReq.java b/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/InstanceQueryParamsReq.java deleted file mode 100644 index 653638c321940583e4a4b3215a52f1d9d04f28ee..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/InstanceQueryParamsReq.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.mortals.xhx.feign.processinstance; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 瀹炰緥鏌ヨQuery - * - * @author: zxfei - * @date: 2021/8/24 20:42 - */ -@Data -public class InstanceQueryParamsReq { - - /** - * 鐢ㄦ埛鐨勫伐鍙� 蹇呭~ - */ - @ApiModelProperty(value = "鐢ㄦ埛鐨勫伐鍙�") - private String userCode; - /** - * 骞冲彴搴旂敤鏍囪瘑 蹇呭~ - */ - @ApiModelProperty(value = "骞冲彴搴旂敤鏍囪瘑") - private String platformSn; - /** - * 寮€濮嬫椂闂� - */ - @ApiModelProperty(value = "寮€濮嬫椂闂�") - private String startTime; - /** - * 缁撴潫鏃堕棿 - */ - @ApiModelProperty(value = "缁撴潫鏃堕棿") - private String endTime; - /** - * 涓氬姟绯荤粺鐨刬d - */ - @ApiModelProperty(value = "涓氬姟绯荤粺鐨刬d") - private String businessKey; - /** - * 鎺掑簭瀛楁 1 鍗囧簭 0 闄嶅簭 - */ - @ApiModelProperty(value = "鎺掑簭瀛楁 1 鍗囧簭 0 闄嶅簭") - private Integer orderFlag = 0; - /** - * 娴佺▼瀹炰緥ID - */ - @ApiModelProperty(value = "娴佺▼瀹炰緥ID") - private String processInstanceId; - - /** - * 娴佺▼瀹氫箟KEY - */ - @ApiModelProperty(value = "娴佺▼瀹氫箟KEY") - private String processDefinitionKey; - /** - * 娴佺▼鐘舵€� - */ - @ApiModelProperty(value = "娴佺▼鐘舵€�") - private String processType; - - /** - * 鍙戣捣浜哄伐鍙烽泦鍚� - */ - @ApiModelProperty(value = "鍙戣捣浜哄伐鍙烽泦鍚�") - private String startedUserIds; - -} diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessCommonReq.java b/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessCommonReq.java deleted file mode 100644 index 2f3a195700ad29131dc8226f7d43162768f904f1..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessCommonReq.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mortals.xhx.feign.processinstance; - -import lombok.Data; - -/** - * 瀹炰緥閫氱敤璇锋眰 - * @author: zxfei - * @date: 2021/8/26 10:42 - * @description: - **/ -@Data -public class ProcessCommonReq { - - /** - * 澶勭悊浜篒d - */ - private String userCode; - /** - * 娴佺▼瀹炰緥id - */ - private String processInstanceId; -} diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessDeleteReq.java b/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessDeleteReq.java deleted file mode 100644 index 8a12380b913f33e8fa072cc17d7e4597a1f590c6..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessDeleteReq.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mortals.xhx.feign.processinstance; - -import lombok.Data; - -/** - * @author: zxfei - * @date: 2021/8/26 10:42 - * @description: - **/ -@Data -public class ProcessDeleteReq { - - /** - * 澶勭悊浜篒d 蹇呭~ - */ - private String userCode; - /** - * 娴佺▼瀹炰緥id 蹇呭~ - */ - private String processInstanceId; - - /** - * 鍒犻櫎鍘熷洜 蹇呭~ - */ - private String deleteReason; - -} diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessInstanceInfo.java b/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessInstanceInfo.java deleted file mode 100644 index 960b9730095e5adbdf591d93ce9b39be55992507..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessInstanceInfo.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.mortals.xhx.feign.processinstance; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * 娴佺▼瀹炰緥杩斿洖鏁版嵁瀵硅薄 - * - * @author: zxfei - * @date: 2021/8/26 10:31 - */ -@Data -@ApiModel(value = "ProcessInstanceInfo" , description = "鏌ヨ娴佺▼瀹炰緥杩斿洖瀵硅薄") -public class ProcessInstanceInfo implements Serializable { - private static final long serialVersionUID = -5038515846218363889L; - - /** - * 娴佺▼瀹炰緥id - */ - private String processInstanceId; - /** - * 娴佺▼瀹氫箟id - */ - private String processDefinitionId; - /** - * 娴佺▼瀹氫箟鐨勫悕绉� - */ - private String processDefinitionName; - /** - * 娴佺▼瀹氫箟鐨刱ey - */ - private String processDefinitionKey; - /** - * 娴佺▼瀹氫箟绫诲瀷 - */ - private Integer processDefinitionType; - /** - * 娴佺▼瀹氫箟鐨勭増鏈彿 - */ - private Integer processDefinitionVersion; - /** - * 鍒嗙被缂栧彿 - */ - private String categoryCode; - /** - * 閮ㄧ讲id - */ - private String deploymentId; - /** - * 涓氬姟琛ㄥ崟鐨刬d - */ - private String businessKey; - /** - * 鍔炵悊浜� - */ - private String assignees; - /** - * 搴旂敤id - */ - private String appId; - /** - * 骞冲彴搴旂敤鏍囪瘑 - */ - private String appSn; - /** - * 鍒涘缓鏃堕棿 - */ - @JsonFormat(timezone = "GMT+8" , pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - /** - * 鎸傝捣鐘舵€� 1婵€娲� 2鎸傝捣 @see ProcessInstanceStatusEnum - */ - private Integer pState; - /** - * 鍒犻櫎鏍囪 - */ - private String reason; - /** - * 鍒涘缓浜虹殑id - */ - private String startedUserId; - /** - * 鍒涘缓浜虹殑鍚嶇О - */ - private String startedUserName; - /** - * 鍒涘缓浜篿ds - */ - private List<String> startedUserIds; - - /** - * 榛樿鎵€鏈夌殑 - */ - private Boolean finishFlag = false; - /** - * 娴佺▼瀹炰緥鐘舵€� @see {@link ProcessStatusEnum} - */ - private String processStatus; - /** - * 娴佺▼瀹炰緥鐘舵€佸悕绉� - */ - private String processStatusName; - /** - * 琛ㄥ崟鐨勫悕绉� - */ - private String formName; - /** - * 娴佺▼鍒涘缓浜哄鍚� - */ - private String startPersonName; - /** - * 娴佺▼鐨勫垱寤烘椂闂� - */ - @JsonFormat(timezone = "GMT+8" , pattern = "yyyy-MM-dd HH:mm:ss") - private Date startTime; - /** - * 缁撴潫鏃堕棿 - */ - @JsonFormat(timezone = "GMT+8" , pattern = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - - private String startTimeStr; - private String endTimeStr; - /** - * 绯荤粺鍚嶇О - */ - private String appName; - /** - * 涓氬姟绯荤粺鐨剈rl - */ - private String businessUrl; - /** - * 鎬昏€楁椂 - */ - private String totalTime; - /** - * 褰撳墠鍔炵悊浜�(褰撳墠娴佺▼鏄浜哄姙鐞�) - */ - // private List<ApproverVo> currentAssignees; - - - - public ProcessInstanceInfo() { - } - - public ProcessInstanceInfo(String processInstanceId, String businessKey, String formName, String startedUserId) { - this.processInstanceId = processInstanceId; - this.businessKey = businessKey; - this.formName = formName; - this.startedUserId = startedUserId; - } - -} diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessStopReq.java b/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessStopReq.java deleted file mode 100644 index e8229953f9d01310c20b8cbb8b6db398c2ea6b40..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessStopReq.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mortals.xhx.feign.processinstance; - -import lombok.Data; - -/** - * @author: zxfei - * @date: 2021/8/26 10:42 - * @description: - **/ -@Data -public class ProcessStopReq { - /** - * 澶勭悊浜篒d 蹇呭~ - */ - private String userCode; - /** - * 娴佺▼瀹炰緥id - */ - private String processInstanceId; -} diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessUpdateStateReq.java b/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessUpdateStateReq.java deleted file mode 100644 index add155a7bc4b754c678522c0d5f59d073f44b3d1..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/processinstance/ProcessUpdateStateReq.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mortals.xhx.feign.processinstance; - -import lombok.Data; - -/** - * @author: zxfei - * @date: 2021/8/26 10:42 - * @description: - **/ -@Data -public class ProcessUpdateStateReq { - /** - * 澶勭悊浜篒d 蹇呭~ - */ - private String userCode; - /** - * 娴佺▼瀹炰緥id 蹇呭~ - */ - private String processInstanceId; - - /** - * 婵€娲绘垨鎸傝捣娴佺▼瀹炰緥(1:婵€娲�,2:鎸傝捣) 蹇呭~ - */ - private Integer suspensionState; - -} diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/runtime/StartProcessInstanceReq.java b/common-lib/src/main/java/com/mortals/xhx/feign/runtime/StartProcessInstanceReq.java deleted file mode 100644 index 41bc290a971fa34240d3e8c13a95001556e2db64..0000000000000000000000000000000000000000 --- a/common-lib/src/main/java/com/mortals/xhx/feign/runtime/StartProcessInstanceReq.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.mortals.xhx.feign.runtime; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.mortals.framework.util.DateUtils; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.Map; - -/** - * 鍚姩娴佺▼鍙傛暟 - * - * @author: zxfei - * @date: 2021/8/26 10:45 - */ -@Data -public class StartProcessInstanceReq implements Serializable { - /** - * 娴佺▼閮ㄧ讲key 蹇呭~ - */ - @ApiModelProperty(value = "娴佺▼瀹氫箟key" , required = true) - private String processDefinitionKey; - /** - * 涓氬姟绯荤粺琛ㄥ崟id 蹇呭~ - */ - @ApiModelProperty(value = "涓氬姟绯荤粺鍞竴鏍囪瘑" , required = true) - private String businessKey; - - /** - * 涓氬姟琛ㄥ崟鏄剧ず鍚嶇О 蹇呭~锛堝璇峰亣鍗曪級 - */ - @ApiModelProperty(value = "琛ㄥ崟鏄剧ず鍚嶇О" , required = true) - private String formName; - /** - * 鍚姩娴佺▼鍙橀噺 閫夊~ - */ - @ApiModelProperty(value = "鍚姩娴佺▼鍙橀噺") - private Map<String, Object> variables; - /** - * 鐢宠浜篿d鍙� 蹇呭~ - */ - @ApiModelProperty(value = "鐢宠浜篿d鍙�") - private String userCode; - /** - * 骞冲彴绯荤粺鏍囪瘑 蹇呭~ - */ - @ApiModelProperty(value = "骞冲彴绯荤粺鏍囪瘑" , required = true) - private String platformSn; - - /** - * 娴佺▼鎻愪氦浜哄伐鍙� 閫氬父鍜岀敵璇蜂汉id涓€鑷村嵆鍙� 蹇呭~ - */ - @ApiModelProperty(value = "娴佺▼鎻愪氦浜哄伐鍙� 閫氬父鍜岀敵璇蜂汉id涓€鑷村嵆鍙�" , required = true) - private String creator; - - public static void main(String[] args) { - - DateTime dateTime = DateUtil.offsetMonth(new Date(), 2); - - - - System.out.println(DateUtils.getStrDate(dateTime)); - - - } - -} diff --git a/sst-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java b/sst-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java index 793d9d806fcc26f978e85e0eb6a51cfdb81f508e..9bd1cde112752a87f0cf8bd2fa8bb482f4aa33f5 100644 --- a/sst-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java +++ b/sst-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java @@ -35,7 +35,7 @@ import java.util.Set; * @author zxfei */ @Primary -@Service +//@Service @Order(1) @Slf4j public class AuthTokenServiceImpl implements IAuthTokenService {