From 34a8af281e39dc2a9e8d4dfc21bb18ca09dde7f6 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 30 Nov 2023 14:19:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java index 0ba16008..23367315 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java @@ -48,7 +48,7 @@ public class FlowRest { //获取下一环节待办人 if (StringUtils.isBlank(bv.getNextNodeUserSids())) { ResultBean userResultBean = flowService.getNextNodeUser(bv); - if (userResultBean.getSuccess()) { + if (!userResultBean.getSuccess()) { return rb.setMsg(userResultBean.getMsg()); } bv.setNextNodeUserSids(userResultBean.getData()); From 90c00007911f4e7a27accdf1e9937251d93066cf Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 30 Nov 2023 14:50:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/api/flow2/FlowFeign.java | 34 +++++++++++++++++++ .../flowable/api/flow2/FlowFeignFallback.java | 12 +++++++ .../flowable/biz/flow2/FlowRest.java | 3 +- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeign.java create mode 100644 yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeignFallback.java diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeign.java new file mode 100644 index 00000000..0e752d21 --- /dev/null +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeign.java @@ -0,0 +1,34 @@ +package com.yxt.supervise.flowable.api.flow2; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.flowable.api.flow.FlowableFallback; +import com.yxt.supervise.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.supervise.flowable.sqloperationsymbol.BusinessVariables; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/11/30 + **/ +@FeignClient( + contextId = "supervise-flowable-Flow", + name = "supervise-flowable", + path = "v2/flow", + fallback = FlowFeignFallback.class) +public interface FlowFeign { + + @ApiOperation(value = "启动流程") + @PostMapping(value = "/startProcess") + public ResultBean startProcess(BusinessVariables bv); + + @ApiOperation(value = "办理") + @PostMapping(value = "/handleProsess") + public ResultBean handleProsess(BusinessVariables bv); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(FlowDelegateQuery flowDelegateQuery); +} diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeignFallback.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeignFallback.java new file mode 100644 index 00000000..1ca95920 --- /dev/null +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.supervise.flowable.api.flow2; + +import org.springframework.stereotype.Component; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/11/30 + **/ +@Component +public class FlowFeignFallback { +} diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java index 23367315..e993aa8e 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java @@ -6,6 +6,7 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.supervise.flowable.api.flow2.FlowDelegateQuery; +import com.yxt.supervise.flowable.api.flow2.FlowFeign; import com.yxt.supervise.flowable.sqloperationsymbol.BusinessVariables; import io.swagger.annotations.ApiOperation; import org.apache.tomcat.util.threads.ThreadPoolExecutor; @@ -27,7 +28,7 @@ import java.util.concurrent.*; **/ @RestController @RequestMapping("v2/flow") -public class FlowRest { +public class FlowRest implements FlowFeign { Logger log = LoggerFactory.getLogger(FlowRest.class); From 236bbd9a7c0baf6bf99bbfcb0b67089f75c404a5 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 30 Nov 2023 14:53:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java index e993aa8e..c3e678c2 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java @@ -37,6 +37,7 @@ public class FlowRest implements FlowFeign { @ApiOperation(value = "启动流程") @PostMapping(value = "/startProcess") + @Override public ResultBean startProcess(BusinessVariables bv) { ResultBean rb = ResultBean.fireFail(); //获取表单中的参数 @@ -61,6 +62,7 @@ public class FlowRest implements FlowFeign { @ApiOperation(value = "办理") @PostMapping(value = "/handleProsess") + @Override public ResultBean handleProsess(BusinessVariables bv) { ResultBean rb = ResultBean.fireFail(); ResultBean updateFlowFieldVoResultBean = flowService.handleProsess(bv, true); @@ -96,6 +98,7 @@ public class FlowRest implements FlowFeign { @ApiOperation(value = "加签") @PostMapping(value = "/delegate") + @Override public ResultBean delegate(FlowDelegateQuery flowDelegateQuery) { return flowService.delegate(flowDelegateQuery); } From d9589c65c608f5fb301a7e79adc70660c8ed2028 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 30 Nov 2023 15:05:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/supervise/flowable/api/flow2/FlowFeign.java | 7 ++++--- .../supervise/enterprisecentre/biz/feign/FlowFeign.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeign.java index 0e752d21..706146bb 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeign.java @@ -7,6 +7,7 @@ import com.yxt.supervise.flowable.sqloperationsymbol.BusinessVariables; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * @description: @@ -22,13 +23,13 @@ public interface FlowFeign { @ApiOperation(value = "启动流程") @PostMapping(value = "/startProcess") - public ResultBean startProcess(BusinessVariables bv); + public ResultBean startProcess(@RequestBody BusinessVariables bv); @ApiOperation(value = "办理") @PostMapping(value = "/handleProsess") - public ResultBean handleProsess(BusinessVariables bv); + public ResultBean handleProsess(@RequestBody BusinessVariables bv); @ApiOperation(value = "加签") @PostMapping(value = "/delegate") - public ResultBean delegate(FlowDelegateQuery flowDelegateQuery); + public ResultBean delegate(@RequestBody FlowDelegateQuery flowDelegateQuery); } diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/feign/FlowFeign.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/feign/FlowFeign.java index de0615ea..8a52d9b3 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/feign/FlowFeign.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/feign/FlowFeign.java @@ -9,6 +9,7 @@ import com.yxt.supervise.enterprisecentre.biz.feign.fallback.FlowableFallback; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * @description: @@ -25,13 +26,13 @@ public interface FlowFeign { @ApiOperation(value = "启动流程") @PostMapping(value = "/startProcess") - public ResultBean startProcess(BusinessVariables bv); + public ResultBean startProcess(@RequestBody BusinessVariables bv); @ApiOperation(value = "办理") @PostMapping(value = "/handleProsess") - public ResultBean handleProsess(BusinessVariables bv); + public ResultBean handleProsess(@RequestBody BusinessVariables bv); @ApiOperation(value = "加签") @PostMapping(value = "/delegate") - public ResultBean delegate(FlowDelegateQuery flowDelegateQuery); + public ResultBean delegate(@RequestBody FlowDelegateQuery flowDelegateQuery); } From 9ef0c79d7f3f7064960d2b59b08d972867cfdf3a Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 30 Nov 2023 15:05:53 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprisecentre/biz/sealrecord/SealRecordRest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordRest.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordRest.java index 43fa6edc..b316dd63 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordRest.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordRest.java @@ -263,7 +263,7 @@ public class SealRecordRest implements SealRecordFeign { @ApiOperation(value = "加签") @PostMapping(value = "/delegate") - public ResultBean delegate(FlowDelegateQuery query) { + public ResultBean delegate(@RequestBody FlowDelegateQuery query) { return sealRecordService.delegate(query); } From f05a68335c4f77dc878461e2a95b49bb5b80fab0 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 30 Nov 2023 15:07:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/supervise/message/message/MessageFeign.java | 2 +- .../com/yxt/supervise/message/biz/message/MessageRest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/message/message/MessageFeign.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/message/message/MessageFeign.java index 565bd4d9..93292316 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/message/message/MessageFeign.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/message/message/MessageFeign.java @@ -20,7 +20,7 @@ public interface MessageFeign { @ApiOperation("流程审批推送消息 抄送") @PostMapping("/pushMessageCC") - public ResultBean pushMessageCC(MessageFlowableQuery query); + public ResultBean pushMessageCC(@RequestBody MessageFlowableQuery query); @ApiOperation("分享") @PostMapping("/pushMessageShare") diff --git a/yxt_supervise/supervise-message/supervise-message-biz/src/main/java/com/yxt/supervise/message/biz/message/MessageRest.java b/yxt_supervise/supervise-message/supervise-message-biz/src/main/java/com/yxt/supervise/message/biz/message/MessageRest.java index b22c52a9..98f9cacf 100644 --- a/yxt_supervise/supervise-message/supervise-message-biz/src/main/java/com/yxt/supervise/message/biz/message/MessageRest.java +++ b/yxt_supervise/supervise-message/supervise-message-biz/src/main/java/com/yxt/supervise/message/biz/message/MessageRest.java @@ -5,6 +5,7 @@ import com.yxt.supervise.message.api.message.MessageFlowableQueryForCC; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; 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.RestController; @@ -22,13 +23,13 @@ public class MessageRest { @ApiOperation("流程审批推送消息 抄送") @PostMapping("/pushMessageCC") - public ResultBean pushMessageCC(MessageFlowableQueryForCC query) { + public ResultBean pushMessageCC(@RequestBody MessageFlowableQueryForCC query) { return messageService.pushMessageForCC(query); } @ApiOperation("流程审批推送消息 分享") @PostMapping("/pushMessageShare") - public ResultBean pushMessageShare(MessageFlowableQueryForCC query) { + public ResultBean pushMessageShare(@RequestBody MessageFlowableQueryForCC query) { return messageService.pushMessageShare(query); } }