异常系统对接v2

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java

@@ -410,13 +410,13 @@ public class AbnormalBillController {
             abnormalBill.setType("Z");
             abnormalBill.setReportFrom("J");
             abnormalBill.setItemBo(HandleEnum.ITEM.getHandle(site,abnormalBill.getItemBo(),"A"));
-            abnormalBill.setReportSendUserGroup("BPM");
+            abnormalBill.setReportSendUserGroup("bpmUserGroup");
             abnormalBill.setSite(site);
             abnormalBill.setPbUser(abnormalBill.getPbUser());
             abnormalBill.setResponseUser(abnormalBill.getPbUser());
             abnormalBill.setResponseDateTime(now);
             abnormalBillDispose.setSite(site);
-            com.foreverwin.modular.core.util.CommonMethods.setUser("BPM_USER");
+            com.foreverwin.modular.core.util.CommonMethods.setUser(abnormalBill.getPbUser());
             abnormalBillService.anomalyReport(abnormalBill, abnormalBillDispose,
                     ncCodesVO.getNcGroupAndNcCodes(), ncCodesVO.getDutyCauseType(), ncCodesVO.getDutyType());
             return new ResultVo(ResultCode.SUCCESS,abnormalBill);
@@ -443,7 +443,7 @@ public class AbnormalBillController {
 
         try{
             abnormalBill.setHandle(HandleEnum.ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo()));
-            //abnormalBill.setBpmSubmit("true");
+            abnormalBill.setBpmSubmit("true");
             abnormalBill.setItemBo(HandleEnum.ITEM.getHandle(site,abnormalBill.getItemBo(),"A"));
             abnormalBillService.programConfirm(abnormalBill,abnormalBillDispose);
             return new ResultVo(ResultCode.SUCCESS,"BPM方案确认回传成功");

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java

@@ -1,6 +1,7 @@
 package com.foreverwin.mesnac.anomaly.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -274,21 +275,35 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         /**
          * mes提报给质量bpm系统
          */
-//        if (!StringUtil.isBlank(abnormalBill.getBpmSubmit()) && abnormalBill.getBpmSubmit().equals("false")) {
+   /*     if (!StringUtil.isBlank(abnormalBill.getBpmSubmit()) && abnormalBill.getBpmSubmit().equals("false")) {
-//            //abnormalBill.setBpmSubmit("false");
+            //产品类别
-//            List<String> NcCodeGroupList = (List)abnormalBill.getNcCodeDesc().stream().map((e) -> {
+            String productCategory = abnormalBill.getProductCategory();
-//                return e.split("/")[0];
+            DataField dataField = new DataField();
-//            }).collect(Collectors.toList());
+            dataField.setDataField("PRODUCT_CATEGORY");
-//            abnormalBill.setPbUser(CommonMethods.getUser());
+            List<DataField> productCategoryList = dataFieldListService.findDataFieldListById(dataField);
-//            YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBill, abnormalBillDispose,
+            for (int i = 0; i < productCategoryList.size(); i++) {
-//                    String.join(";", NcCodeGroupList), String.join(";", abnormalBill.getNcCodeDesc()));
+                String dataValue = JSONArray.toJSONString(productCategoryList.get(i));
-//            if (!bpmApiRes.getErrCode().equals(0)) {
+                HashMap<String,String> fieldMap = JSON.parseObject(dataValue, HashMap.class);
-//                throw new BaseException("MES提报给质量BPM系统失败");
+                if (fieldMap.get("dataValue").equals(abnormalBill.getProductCategory())){
-//            }
+                    abnormalBill.setProductCategory(fieldMap.get("description"));
-//
+                }
-//            String workflowInstanceId = JSON.parseObject(String.valueOf(bpmApiRes.getData())).getString("workflowInstanceId");
+            }
-//            abnormalBill.setBpmFlowId(workflowInstanceId);
+            List<String> NcCodeGroupList = (List)abnormalBill.getNcCodeDesc().stream().map((e) -> {
-//        }
+                return e.split("/")[0];
+            }).collect(Collectors.toList());
+            abnormalBill.setPbUser(CommonMethods.getUser());
+            YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBill, abnormalBillDispose,
+                    String.join(";", NcCodeGroupList), String.join(";", abnormalBill.getNcCodeDesc()));
+            if (!bpmApiRes.getErrCode().equals(0)) {
+                throw new BaseException("MES提报给质量BPM系统失败");
+            }
+            String workflowInstanceId = JSON.parseObject(String.valueOf(bpmApiRes.getData())).getString("workflowInstanceId");
+            abnormalBill.setBpmFlowId(workflowInstanceId);
+            abnormalBill.setProductCategory(productCategory);
+            //abnormalBill.setStatus(Constants.RESPONSE);
+            //abnormalBill.setResponseUser(CommonMethods.getUser());
+            //abnormalBill.setResponseDateTime(now);
+        }*/
 
 
         ArrayList<AbnormalNcCode> abnormalNcCodes = new ArrayList<>();
@@ -333,7 +348,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
 
         //发送消息
-        if(Constants.NEW.equals(abnormalBill.getStatus()) && !abnormalBill.getReportSendUserGroup().equals("BPM")){
+        if(Constants.NEW.equals(abnormalBill.getStatus()) && abnormalBill.getBpmSubmit().equals("false")){
             this.anomalyCreatedAndSendMessage(abnormalBill,null);
         }
 
@@ -691,16 +706,16 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         String local = LocaleContextHolder.getLocale().getLanguage();
         abnormalBillDispose.setHandle(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()));
 
-//        if (StringUtil.isBlank(abnormalBill.getBpmSubmit())){
+      /*  if (StringUtil.isBlank(abnormalBill.getBpmSubmit())){
-//            AbnormalBill aBill = new AbnormalBill();
+            AbnormalBill aBill = new AbnormalBill();
-//            aBill.setAbnormalNo(abnormalBill.getAbnormalNo());
+            aBill.setAbnormalNo(abnormalBill.getAbnormalNo());
-//            List<AbnormalBill> abnormalBills = this.selectList(aBill);
+            List<AbnormalBill> abnormalBills = this.selectList(aBill);
-//            abnormalBills.get(0).setStatus(Constants.SHUT_DOWN);
+            abnormalBills.get(0).setStatus(Constants.SHUT_DOWN);
-//            YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBills.get(0), abnormalBillDispose, null, null);
+            YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBills.get(0), abnormalBillDispose, null, null);
-//            if (!bpmApiRes.getErrCode().equals(0)) {
+            if (!bpmApiRes.getErrCode().equals(0)) {
-//                    throw BusinessException.build("BPM闭环关闭失败");
+                    throw BusinessException.build("BPM闭环关闭失败");
-//                }
+                }
-//        }
+        }*/
 
         if(!StringUtil.isBlank(abnormalBill.getStatus())){
             abnormalBill.setStatus(abnormalBill.getStatus());