Merge remote-tracking branch 'origin/master'

yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/api/flow2/FlowFeign.java

@@ -0,0 +1,35 @@
+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;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @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<UpdateFlowFieldVo> startProcess(@RequestBody BusinessVariables bv);
+
+    @ApiOperation(value = "办理")
+    @PostMapping(value = "/handleProsess")
+    public ResultBean<UpdateFlowFieldVo> handleProsess(@RequestBody BusinessVariables bv);
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    public ResultBean delegate(@RequestBody FlowDelegateQuery flowDelegateQuery);
+}

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 {
+}

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);
 
@@ -36,6 +37,7 @@ public class FlowRest {
 
     @ApiOperation(value = "启动流程")
     @PostMapping(value = "/startProcess")
+    @Override
     public ResultBean<UpdateFlowFieldVo> startProcess(BusinessVariables bv) {
         ResultBean<UpdateFlowFieldVo> rb = ResultBean.fireFail();
         //获取表单中的参数
@@ -48,7 +50,7 @@ public class FlowRest {
         //获取下一环节待办人
         if (StringUtils.isBlank(bv.getNextNodeUserSids())) {
             ResultBean<String> userResultBean = flowService.getNextNodeUser(bv);
-            if (userResultBean.getSuccess()) {
+            if (!userResultBean.getSuccess()) {
                 return rb.setMsg(userResultBean.getMsg());
             }
             bv.setNextNodeUserSids(userResultBean.getData());
@@ -60,6 +62,7 @@ public class FlowRest {
 
     @ApiOperation(value = "办理")
     @PostMapping(value = "/handleProsess")
+    @Override
     public ResultBean<UpdateFlowFieldVo> handleProsess(BusinessVariables bv) {
         ResultBean<UpdateFlowFieldVo> rb = ResultBean.fireFail();
         ResultBean<UpdateFlowFieldVo> updateFlowFieldVoResultBean = flowService.handleProsess(bv, true);
@@ -95,6 +98,7 @@ public class FlowRest {
 
     @ApiOperation(value = "加签")
     @PostMapping(value = "/delegate")
+    @Override
     public ResultBean delegate(FlowDelegateQuery flowDelegateQuery) {
         return flowService.delegate(flowDelegateQuery);
     }

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<String> pushMessageCC(MessageFlowableQuery query);
+    public ResultBean<String> pushMessageCC(@RequestBody MessageFlowableQuery query);
 
     @ApiOperation("分享")
     @PostMapping("/pushMessageShare")

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<String> pushMessageCC(MessageFlowableQueryForCC query) {
+    public ResultBean<String> pushMessageCC(@RequestBody MessageFlowableQueryForCC query) {
         return messageService.pushMessageForCC(query);
     }
 
     @ApiOperation("流程审批推送消息  分享")
     @PostMapping("/pushMessageShare")
-    public ResultBean<String> pushMessageShare(MessageFlowableQueryForCC query) {
+    public ResultBean<String> pushMessageShare(@RequestBody MessageFlowableQueryForCC query) {
         return messageService.pushMessageShare(query);
     }
 }

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<UpdateFlowFieldVo> startProcess(BusinessVariables bv);
+    public ResultBean<UpdateFlowFieldVo> startProcess(@RequestBody BusinessVariables bv);
 
     @ApiOperation(value = "办理")
     @PostMapping(value = "/handleProsess")
-    public ResultBean<UpdateFlowFieldVo> handleProsess(BusinessVariables bv);
+    public ResultBean<UpdateFlowFieldVo> handleProsess(@RequestBody BusinessVariables bv);
 
     @ApiOperation(value = "加签")
     @PostMapping(value = "/delegate")
-    public ResultBean delegate(FlowDelegateQuery flowDelegateQuery);
+    public ResultBean delegate(@RequestBody FlowDelegateQuery flowDelegateQuery);
 }

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);
 	}