1、bug修复-系统异常后事务未回滚

2、指定人员打回

src/main/java/com/zcloud/controller/xgf/XgfUserController.java

@@ -66,12 +66,13 @@ public class XgfUserController extends BaseController {
     @RequestMapping(value = "/approvePlus")
     @ResponseBody
     public Object approvePlus(@RequestParam(value = "chengNuoShu", required = false) MultipartFile[] chengNuoShu) throws Exception {
-        PageData request = this.getPageData();
-        xgfUserService.approvePlus(request,chengNuoShu);
         PageData response = new PageData();
         response.put("result", "success");
+        PageData request = this.getPageData();
+        xgfUserService.approvePlus(request, chengNuoShu);
         response.put("data", request);
         return response;
+
     }
 
     /**
@@ -81,10 +82,18 @@ public class XgfUserController extends BaseController {
     @ResponseBody
     public Object approveMax(@RequestParam(value = "chengNuoShu", required = false) MultipartFile[] chengNuoShu) throws Exception {
         PageData request = this.getPageData();
-        xgfUserService.approveMax(request,chengNuoShu);
         PageData response = new PageData();
         response.put("result", "success");
+        response.put("code","0");
         response.put("data", request);
+        try {
+            xgfUserService.approveMax(request, chengNuoShu);
+        } catch (Exception e) {
+            e.printStackTrace();
+            response.put("code", "9999");
+            response.put("errorMessage", e.getMessage());
+            return response;
+        }
         return response;
     }
 

src/main/java/com/zcloud/flow/xgf/GuFen/GuFenCharge.java

@@ -54,6 +54,7 @@ public class GuFenCharge extends NodeSwitchComponent {
         System.out.println(getName() + "节点");
 
         XgfFlowDto info = this.getRequestData();
+        try {
             PageData condition = new PageData();
 
             condition.put("FLOWS_ID", info.getFLOWS_ID());
@@ -113,11 +114,19 @@ public class GuFenCharge extends NodeSwitchComponent {
                 xgfUserService.saveLog(info, info.getSTATUS(), "0");
             }
             return "GuFenSupervise";
+        } catch (Exception e) {
+            e.printStackTrace();
+            info.setErrorMsg(e.getMessage());
+            return "";
+        }
     }
 
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
+        if (StringUtils.isNotBlank(info.getErrorMsg())) {
+            throw new RuntimeException(info.getErrorMsg());
+        }
         if ("0".equals(info.getSTATUS()) && "0".equals(info.getIterator())) {
             return true;
         }

src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java

@@ -50,9 +50,8 @@ public class GuFenSupervise extends NodeComponent {
     @Override
     public void process() throws Exception {
         System.out.println(getName() + "节点");
-
-
         XgfFlowDto info = this.getRequestData();
+        try {
             PageData condition = new PageData();
 
             condition.put("FLOWS_ID", info.getFLOWS_ID());
@@ -88,11 +87,18 @@ public class GuFenSupervise extends NodeComponent {
                 // 保存操作记录
                 xgfUserService.saveLog(info, info.getSTATUS(), "1");
             }
+        } catch (Exception e) {
+            info.setErrorMsg(e.getMessage());
+            e.printStackTrace();
+        }
     }
 
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
+        if (StringUtils.isNotBlank(info.getErrorMsg())) {
+            throw new RuntimeException(info.getErrorMsg());
+        }
         if ("0".equals(info.getSTATUS())) {
             return true;
         }

src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoCharge.java

@@ -53,11 +53,9 @@ public class GuFenWeiTuoCharge extends NodeComponent {
 
     @Override
     public void process() throws Exception {
-
         System.out.println(getName() + "节点");
-
-
         XgfFlowDto info = this.getRequestData();
+        try {
             PageData condition = new PageData();
 
             condition.put("FLOWS_ID", info.getFLOWS_ID());
@@ -107,15 +105,20 @@ public class GuFenWeiTuoCharge extends NodeComponent {
                 // 清空指针
                 info.setIterator("");
             }
-
             // 保存操作记录
             xgfUserService.saveLog(info, info.getSTATUS(), "0");
-
+        } catch (Exception e) {
+            e.printStackTrace();
+            info.setErrorMsg(e.getMessage());
+        }
     }
 
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
+        if (StringUtils.isNotBlank(info.getErrorMsg())) {
+            throw new RuntimeException(info.getErrorMsg());
+        }
         if ("0".equals(info.getSTATUS()) && "1".equals(info.getIterator())) {
             return true;
         }

src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java

@@ -56,6 +56,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
     public void process() throws Exception {
         System.out.println(getName() + "节点");
         XgfFlowDto info = this.getRequestData();
+        try {
             PageData condition = new PageData();
 
             condition.put("FLOWS_ID", info.getFLOWS_ID());
@@ -91,11 +92,18 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
                 xgfUserService.saveLog(info, info.getSTATUS(), "1");
                 info.setIterator("");
             }
+        } catch (Exception e) {
+            info.setErrorMsg(e.getMessage());
+            e.printStackTrace();
+        }
     }
 
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
+        if (StringUtils.isNotBlank(info.getErrorMsg())) {
+            throw new RuntimeException(info.getErrorMsg());
+        }
         if ("0".equals(info.getSTATUS()) && "2".equals(info.getIterator())) {
             return true;
         }

src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanCharge.java

@@ -55,6 +55,7 @@ public class JiTuanCharge extends NodeSwitchComponent {
         System.out.println(getName() + "节点");
 
         XgfFlowDto info = this.getRequestData();
+        try {
             PageData condition = new PageData();
 
             condition.put("FLOWS_ID", info.getFLOWS_ID());
@@ -113,11 +114,19 @@ public class JiTuanCharge extends NodeSwitchComponent {
                 xgfUserService.saveLog(info, info.getSTATUS(), "0");
             }
             return "JiTuanSupervise";
+        } catch (Exception e) {
+            e.printStackTrace();
+            info.setErrorMsg(e.getMessage());
+            return "";
+        }
     }
 
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
+        if (StringUtils.isNotBlank(info.getErrorMsg())) {
+            throw new RuntimeException(info.getErrorMsg());
+        }
         if ("0".equals(info.getSTATUS()) && "1".equals(info.getIterator())) {
             return true;
         }

src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java

@@ -54,6 +54,7 @@ public class JiTuanSupervise extends NodeComponent {
         System.out.println(getName() + "节点");
 
         XgfFlowDto info = this.getRequestData();
+        try {
             PageData condition = new PageData();
 
             condition.put("FLOWS_ID", info.getFLOWS_ID());
@@ -88,11 +89,18 @@ public class JiTuanSupervise extends NodeComponent {
                 // 保存操作记录
                 xgfUserService.saveLog(info, info.getSTATUS(), "1");
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            info.setErrorMsg(e.getMessage());
+        }
     }
 
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
+        if (StringUtils.isNotBlank(info.getErrorMsg())) {
+            throw new RuntimeException(info.getErrorMsg());
+        }
         if ("0".equals(info.getSTATUS())) {
             return true;
         }

src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoCharge.java

@@ -55,8 +55,8 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
     @Override
     public void process() throws Exception {
         System.out.println(getName() + "节点");
-
         XgfFlowDto info = this.getRequestData();
+        try {
             PageData condition = new PageData();
 
             condition.put("FLOWS_ID", info.getFLOWS_ID());
@@ -92,12 +92,18 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
 
             // 保存操作记录
             xgfUserService.saveLog(info, info.getSTATUS(), "0");
-
+        } catch (Exception e) {
+            e.printStackTrace();
+            info.setErrorMsg(e.getMessage());
+        }
     }
 
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
+        if (StringUtils.isNotBlank(info.getErrorMsg())) {
+            throw new RuntimeException(info.getErrorMsg());
+        }
         if ("0".equals(info.getSTATUS()) && "2".equals(info.getIterator())) {
             return true;
         }

src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java

@@ -55,6 +55,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
         System.out.println(getName() + "节点");
 
         XgfFlowDto info = this.getRequestData();
+        try {
             PageData condition = new PageData();
 
             condition.put("FLOWS_ID", info.getFLOWS_ID());
@@ -89,12 +90,19 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
                 // 保存操作记录
                 xgfUserService.saveLog(info, info.getSTATUS(), "1");
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            info.setErrorMsg(e.getMessage());
+        }
 
     }
 
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
+        if (StringUtils.isNotBlank(info.getErrorMsg())) {
+            throw new RuntimeException(info.getErrorMsg());
+        }
         if ("0".equals(info.getSTATUS()) && "3".equals(info.getIterator())) {
             return true;
         }

src/main/java/com/zcloud/flow/xgf/YiBan/YiBanCharge.java

@@ -57,6 +57,7 @@ public class YiBanCharge extends NodeComponent {
     public void process() throws Exception {
         System.out.println("YiBanCharge节点");
         XgfFlowDto info = this.getRequestData();
+        try {
             PageData condition = new PageData();
             condition.put("FLOWS_ID", info.getFLOWS_ID());
             PageData flows = xgfFlowsMapper.findById(condition);
@@ -93,11 +94,18 @@ public class YiBanCharge extends NodeComponent {
             }
             // 保存操作记录
             xgfUserService.saveLog(info, info.getSTATUS(), "0");
+        }catch (Exception e){
+            e.printStackTrace();
+            info.setErrorMsg(e.getMessage());
+        }
     }
 
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
+        if (StringUtils.isNotBlank(info.getErrorMsg())){
+            throw new RuntimeException(info.getErrorMsg());
+        }
         if ("0".equals(info.getSTATUS()) && "0".equals(info.getIterator())) {
             return true;
         }

src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java

@@ -57,7 +57,7 @@ public class YiBanSupervise extends NodeComponent {
     public void process() throws Exception {
         System.out.println(getName());
         XgfFlowDto info = this.getRequestData();
-
+        try {
             PageData condition = new PageData();
 
             condition.put("FLOWS_ID", info.getFLOWS_ID());
@@ -122,11 +122,18 @@ public class YiBanSupervise extends NodeComponent {
                 // 保存操作记录
                 xgfUserService.saveLog(info, info.getSTATUS(), "1");
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            info.setErrorMsg(e.getMessage());
+        }
     }
 
     @Override
     public boolean isEnd() {
         XgfFlowDto info = this.getRequestData();
+        if (StringUtils.isNotBlank(info.getErrorMsg())){
+            throw new RuntimeException(info.getErrorMsg());
+        }
         if ("0".equals(info.getSTATUS())) {
             return true;
         }

src/main/java/com/zcloud/flow/xgf/util/XgfFlowDto.java

@@ -49,4 +49,6 @@ public class XgfFlowDto {
 
     // 打回节点游标
     private String BACK_STEP;
+    private String errorMsg;
+    private String code;
 }

src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java

@@ -1007,7 +1007,7 @@ public class XgfUserServiceImpl implements XgfUserService {
             key.put("OPINION", flows.get("OPINION"));
             Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key);
             if (result == null || !"succeed".equals(result.get("result"))) {
-                throw new RuntimeException("请求失败");
+                info.setErrorMsg("请求失败");
             }
             xgfUserMapper.edit(entity);
             this.clearInfo(flows);
@@ -1017,15 +1017,19 @@ public class XgfUserServiceImpl implements XgfUserService {
             PageData condition = new PageData();
             condition.put("FLOWS_ID",flows.getString("FLOWS_ID"));
             PageData flowEntity = xgfFlowsMapper.findById(condition);
-            if (flowEntity != null && flowEntity.size() > 0 && flowEntity.getString("FLOWS_STEP").equals(info.getBACK_STEP())){
+            if (flowEntity != null && flowEntity.size() > 0 && (flowEntity.get("FLOWS_STEP").toString()).equals(info.getBACK_STEP())){
-                throw new RuntimeException("不能自己打回到自己");
+                info.setErrorMsg("不能自己打回到自己");
             }
             flowEntity.put("FLOWS_STEP", info.getBACK_STEP());
             xgfFlowsMapper.edit(flowEntity);
+            // 2、保存审批记录
+            this.saveLog(info, "0", "0");
+
         }
     }
 
     @Override
+    @Transactional
     public void approveMax(PageData request, MultipartFile[] chengNuoShu) throws Exception {
         if (chengNuoShu != null && chengNuoShu.length > 0) {
             request.put("APPOINT_ANNEX", Warden.saveFile(Warden.createZip(chengNuoShu), Jurisdiction.getCORPINFO_ID()));
@@ -1070,16 +1074,16 @@ public class XgfUserServiceImpl implements XgfUserService {
             if (request.get("APPOINT_ANNEX") != null) {
                 info.setAPPOINT_ANNEX(request.getString("APPOINT_ANNEX"));
             }
+            info.setBACK_STEP(request.getString("BACK_STEP"));
 
             // 进行数据审核
             LiteflowResponse response = flowExecutor.execute2Resp("chain1", info);
-            if (!response.isSuccess()) {
+            if (response.isSuccess()) {
+                System.out.println("流程信息:" + response.getExecuteStepStrWithTime());
+            } else {
                 Exception e = response.getCause();
                 e.printStackTrace();
-                System.out.println(response.getMessage());
+                throw new RuntimeException(e.getMessage());
-                throw new RuntimeException("系统异常");
-            } else {
-                System.out.println("流程信息:" + response.getExecuteStepStrWithTime());
             }
         }