fix(jg):改造告知接口调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgReformNoticeDto.java

@@ -181,9 +181,6 @@ public class JgReformNoticeDto extends BaseDto {
     @ApiModelProperty (value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 
-    @ApiModelProperty(value = "管道列表")
-    private List<Map<String, Object>> pipelineList;
-
     @ApiModelProperty(value = "删除的管道列表")
     private List<Map<String, Object>> delPipelineList;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJgProjectContraptionController.java

@@ -140,7 +140,10 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个管道工程装置表", notes = "根据sequenceNbr查询单个管道工程装置表")
 	// 传record的原因是前端组件内部写死了，此处是工程装置表seq
 	public ResponseModel<Object> detailsNotFormId(@RequestParam("record") String sequenceNbr) {
-		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.details(sequenceNbr).get(EQUIP_INFO_FORM_ID));
+		Map<String, Object> objectMap = idxBizJgProjectContraptionServiceImpl.details(sequenceNbr).get(EQUIP_INFO_FORM_ID);
+		Object pipelineListObj = objectMap.remove("pipelineList");
+		objectMap.put("deviceList", pipelineListObj);
+		return ResponseHelper.buildResponse(objectMap);
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgReformNoticeServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -89,7 +91,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PROCESS_DEFINITION_KEY = "renovationNoticeNew";
     private static final String TABLE_PAGE_ID = "reformNoticeAdd";
-    public static final String PIPELINE_LIST = "pipelineList";
+    public static final String DEVICE_LIST = "deviceList";
     public static final String PIPE_LENGTH = "pipeLength";
     public static final String RECORD = "record";
     public static final String SEQUENCE_NBR = "SEQUENCE_NBR";
@@ -101,7 +103,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     public static final String PRODUCT_PHOTO = "PRODUCT_PHOTO";
     public static final String PRODUCT_QUALIFICATION_CERTIFICATE = "PRODUCT_QUALIFICATION_CERTIFICATE";
     public static final String OTHER_ACCESSORIES = "OTHER_ACCESSORIES";
-    public static final String DEL_PIPELINE_LIST = "delPipelineList";
+    public static final String DEL_DEVICE_LIST = "delDeviceList";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("6610", "6614", "6615", "6617", "6616");
     // 西安行政区划code
     private static final String XIAN = "610100";
@@ -176,7 +178,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             List<String> ids = noticeEqs.stream().map(JgReformNoticeEq::getEquId).collect(Collectors.toList());
             Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);
             List<Map<String, Object>> equipListMaps = getEquipListMaps(equips);
-            reformNoticeMap.put("deviceList", equipListMaps);
+            reformNoticeMap.put(DEVICE_LIST, equipListMaps);
             reformNoticeMap.put("EQU_LIST_CODE", notice.getEquListCode());
             reformNoticeMap.put("EQU_CATEGORY_CODE", notice.getEquCategoryCode());
             reformNoticeMap.put("QUERY_TYPE", "GZ_GZ");
@@ -222,8 +224,10 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             // 字段转换
             this.convertField(noticeDto);
             JgReformNotice notice = this.getById(noticeDto.getSequenceNbr());
-            List<Map<String, Object>> deviceList = EquipmentClassifityEnum.YLGD.getCode().equals(notice.getEquListCode()) ? noticeDto.getDeviceList() : noticeDto.getPipelineList();
-            List<String> records = deviceList.stream().map(equ -> String.valueOf(equ.get(RECORD))).collect(Collectors.toList());
+            // 业务单据中的设备主键 管道的为record 其他设备为SEQUENCE_NBR
+            String equSeq = !EquipmentClassifityEnum.YLGD.getCode().equals(notice.getEquListCode()) ? SEQUENCE_NBR : RECORD;
+            List<Map<String, Object>> deviceList = noticeDto.getDeviceList();
+            List<String> records = deviceList.stream().filter(item -> !Objects.isNull(item.get(RECORD))).map(equ -> String.valueOf(equ.get(RECORD))).collect(Collectors.toList());
             this.checkRepeatUsed(submitType, records, notice);
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 // 发起流程
@@ -255,8 +259,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     // 压力管道情况处理
                     if (EquipmentClassifityEnum.YLGD.getCode().equals(notice.getEquListCode())) {
                         oldPipJsonData = this.getNowPipJsonData(noticeDto.getProjectContraptionId());
-                        notice.setPipeLengthChanged(this.calculatePipeLengthChange(JSONArray.parseArray(JSON.toJSONString(oldPipJsonData.get(PIPELINE_LIST))),
-                                                                                   JSONArray.parseArray(JSON.toJSONString(noticeDto.getPipelineList()))));
+                        notice.setPipeLengthChanged(this.calculatePipeLengthChange(JSONArray.parseArray(JSON.toJSONString(oldPipJsonData.get(DEVICE_LIST))),
+                                                                                   JSONArray.parseArray(JSON.toJSONString(noticeDto.getDeviceList()))));
                     }
                     jgReformNoticeMapper.updateById(notice);
                     // 删除暂存
@@ -309,12 +313,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             // eq关系表
             List<JgReformNoticeEq> noticeEqs = new ArrayList<>();
             // 更新设备关系表
-            deviceList.forEach(obj -> {
-                JgReformNoticeEq jgRelationEquip = new JgReformNoticeEq();
-                jgRelationEquip.setEquId(String.valueOf(obj.get(SEQUENCE_NBR)));
-                jgRelationEquip.setEquipTransferId(String.valueOf(notice.getSequenceNbr()));
-                noticeEqs.add(jgRelationEquip);
-            });
+            deviceList.stream().filter(obj -> !Objects.isNull(obj.get(equSeq)))
+                    .forEach(obj -> {
+                        JgReformNoticeEq jgRelationEquip = new JgReformNoticeEq();
+                        jgRelationEquip.setEquId(String.valueOf(obj.get(equSeq)));
+                        jgRelationEquip.setEquipTransferId(String.valueOf(notice.getSequenceNbr()));
+                        noticeEqs.add(jgRelationEquip);
+                    });
             jgReformNoticeEqMapper.insertBatchSomeColumn(noticeEqs);
             return noticeDto;
         } catch (BadRequest | LocalBadRequest e) {
@@ -352,8 +357,10 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 String noticeStatusDesc = FlowStatusEnum.getNameByType(Long.valueOf((String) notice.get("noticeStatus")));
                 notice.put("noticeStatusDesc", noticeStatusDesc);
             });
-            // 添加作废标识：不在流程中即可作废
-            notice.put("canVoided", idxBizJgProjectContraptionMapper.countContraptionInUseTimesForDeleteByIntoManagement(Long.parseLong(String.valueOf(notice.get("projectContraptionId")))) == 0);
+            // 压力管道添加作废标识：不在流程中即可作废
+            if (EquipmentClassifityEnum.YLGD.getCode().equals(notice.get("equListCode")) && !ValidationUtil.isEmpty(notice.get("projectContraptionId"))) {
+                notice.put("canVoided", idxBizJgProjectContraptionMapper.countContraptionInUseTimesForDeleteByIntoManagement(Long.parseLong(String.valueOf(notice.get("projectContraptionId")))) == 0);
+            }
         }).collect(Collectors.toList());
 
         noticePage.setRecords(mappedRecords);
@@ -445,7 +452,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             JSONObject oldPipJsonData = new JSONObject();
             List<JgReformNoticeEq> noticeEqs = new ArrayList<>();
             // 获取告知设备列表
-            List<Map<String, Object>> deviceList = !EquipmentClassifityEnum.YLGD.getCode().equals(equListCode) ? model.getDeviceList() : model.getPipelineList();
+            List<Map<String, Object>> deviceList = model.getDeviceList();
+            // 业务单据中的设备主键 管道的为record 其他设备为SEQUENCE_NBR
+            String equSeq = !EquipmentClassifityEnum.YLGD.getCode().equals(equListCode) ? SEQUENCE_NBR : RECORD;
             if (CollectionUtils.isEmpty(deviceList)) {
                 throw new BadRequest("请选择设备!");
             }
@@ -511,8 +520,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             // 压力管道情况处理
             if (EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)) {
                 oldPipJsonData = this.getNowPipJsonData(String.valueOf(jsonObject.get(PROJECT_CONTRAPTION_ID)));
-                notice.setPipeLengthChanged(this.calculatePipeLengthChange(JSONArray.parseArray(JSON.toJSONString(oldPipJsonData.get(PIPELINE_LIST))),
-                                                                           JSONArray.parseArray(JSON.toJSONString(jsonObject.get(PIPELINE_LIST)))));
+                notice.setPipeLengthChanged(this.calculatePipeLengthChange(JSONArray.parseArray(JSON.toJSONString(oldPipJsonData.get(DEVICE_LIST))),
+                                                                           JSONArray.parseArray(JSON.toJSONString(jsonObject.get(DEVICE_LIST)))));
             }
             this.saveOrUpdateHisData(String.valueOf(sequenceNbr), jsonObject, oldPipJsonData);
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
@@ -523,9 +532,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             // 插入业务单
             jgReformNoticeMapper.insert(notice);
             // 更新设备关系表
-            deviceList.stream().filter(obj -> !Objects.isNull(obj.get(RECORD)))
+            deviceList.stream().filter(obj -> !Objects.isNull(obj.get(equSeq)))
                     .map(obj -> new JgReformNoticeEq()
-                            .setEquId(obj.get(RECORD).toString())
+                            .setEquId(obj.get(equSeq).toString())
                             .setEquipTransferId(String.valueOf(sequenceNbr)))
                     .forEach(noticeEqs::add);
             jgReformNoticeEqMapper.insertBatchSomeColumn(noticeEqs);
@@ -562,22 +571,20 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         return new JSONObject(Optional.ofNullable(idxBizJgProjectContraptionMapper.getDetail(projectContraptionId))
                                       .map(map -> {
                                           commonService.convertStringToJsonobject(map, IdxBizJgProjectContraptionServiceImpl.jsonFields);
-                                          map.put(PIPELINE_LIST, idxBizJgProjectContraptionMapper.selectEquipList((String) map.get(SEQUENCE_NBR)));
+                                          map.put(DEVICE_LIST, idxBizJgProjectContraptionMapper.selectEquipList((String) map.get(SEQUENCE_NBR)));
                                           return map;
                                       })
                                       .orElse(Collections.emptyMap()));
     }
 
     private void repeatUsedEquipCheck(List<Map<String, Object>> equipList, String companyCode) {
-        equipList.forEach(equipMap ->
-                                  EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                                          .equipRepeatUsedCheck(String.valueOf(equipMap.get(RECORD)), companyCode));
+        equipList.stream().filter(item -> !Objects.isNull(item.get(RECORD))).forEach(equipMap -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).equipRepeatUsedCheck(String.valueOf(equipMap.get(RECORD)), companyCode));
     }
 
     private void checkRepeatUsed(String submitType, List<String> records, JgReformNotice jgReformNotice) {
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             // 流程中校验
-            records.forEach(record -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+            records.stream().filter(item -> !Objects.isNull(item)).forEach(record -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
                     .equipRepeatUsedCheck(record, jgReformNotice.getInstallUnitCreditCode()));
         }
     }
@@ -828,7 +835,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
      * @param dto 改造信息
      * @param op  通过或驳回
      */
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public void accept(Map<String, Object> map, String op) {
         LinkedHashMap model1 = (LinkedHashMap) map.get("model");
         String opinion = (String) map.get("opinion");
@@ -893,8 +900,6 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                         noticeEq.setInformNumber(deviceRegistrationCode);
                         jgReformNoticeEqMapper.updateById(noticeEq);
                     });
-                    // 通过时记录或更新历史数据
-                    this.saveOrUpdateHisData(String.valueOf(jgReformNotice.getSequenceNbr()), jsonObject, null);
                     jgReformNotice.setAcceptDate(new Date());
                     jgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     jgReformNotice.setPromoter("");
@@ -954,10 +959,10 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         // 1.更新工程装置数据
         JgRegistrationHistory registrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, notice.getSequenceNbr()));
         JSONObject newData = JSONObject.parseObject(registrationHistory.getChangeData());
-        JSONArray newPipData = JSONArray.parseArray(newData.getString(PIPELINE_LIST));
-        JSONArray delPipData = JSONArray.parseArray(newData.getString(DEL_PIPELINE_LIST));
+        JSONArray newPipData = JSONArray.parseArray(newData.getString(DEVICE_LIST));
+        JSONArray delPipData = JSONArray.parseArray(newData.getString(DEL_DEVICE_LIST));
         JSONObject oldData = JSONObject.parseObject(registrationHistory.getOldData());
-        JSONArray oldPipData = JSONArray.parseArray(oldData.getString(PIPELINE_LIST));
+        JSONArray oldPipData = JSONArray.parseArray(oldData.getString(DEVICE_LIST));
         // 1.1更新工程装置中的【管道信息】增加减少或修改管道信息
         List<JSONObject> toUpdatePipData = newPipData.stream().filter(item -> !StringUtils.isEmpty(JSON.parseObject(item.toString()).getString(RECORD))).map(item -> JSON.parseObject(item.toString())).collect(Collectors.toList());
         List<JSONObject> toAddPipData = newPipData.stream().filter(item -> StringUtils.isEmpty(JSON.parseObject(item.toString()).getString(RECORD))).map(item -> JSON.parseObject(item.toString())).collect(Collectors.toList());
@@ -1119,6 +1124,14 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             otherInfo.setInformationManageCode("");
             otherInfoList.add(otherInfo);
 
+            // 检验检测
+            IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(toJSONString(pipData), IdxBizJgInspectionDetectionInfo.class);
+            inspectionDetectionInfo.setRecord(record);
+            inspectionDetectionInfo.setRecDate(date);
+            Optional.ofNullable(inspectionDetectionInfo.getNextInspectDate()).ifPresent(x -> inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(DateUtil.format(inspectionDetectionInfo.getNextInspectDate(), DatePattern.NORM_DATE_PATTERN))));
+            inspectionDetectionInfo.setSequenceNbr(null);
+            idxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+
             // 管道技术参数
             IdxBizJgTechParamsPipeline pipelineInfo = JSON.parseObject(toJSONString(pipData), IdxBizJgTechParamsPipeline.class);
             if (!ValidationUtil.isEmpty(pipelineInfo)) {
@@ -1164,8 +1177,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
 
     private void saveOrUpdateHisData(String sequenceNbr, JSONObject changeData, JSONObject oldData) {
-        this.saveOrUpdateHistory(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName(), new JSONObject(changeData),
-                                 new JSONObject(oldData), sequenceNbr);
+        this.saveOrUpdateHistory(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName(), changeData, oldData, sequenceNbr);
     }
 
     public void saveOrUpdateHistory(String registrationClass, JSON changeData, JSON oldData, String currentDocumentId) {
@@ -1287,15 +1299,21 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         }
         JgRegistrationHistory registrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, notice.getSequenceNbr()));
         JSONObject newData = JSONObject.parseObject(registrationHistory.getChangeData());
-        JSONArray alreadyDelPipData = JSONArray.parseArray(newData.getString(DEL_PIPELINE_LIST));
+        JSONArray alreadyDelPipData = JSONArray.parseArray(newData.getString(DEL_DEVICE_LIST));
         JSONObject oldData = JSONObject.parseObject(registrationHistory.getOldData());
-        JSONArray oldPipData = JSONArray.parseArray(oldData.getString(PIPELINE_LIST));
+        JSONArray oldPipData = JSONArray.parseArray(oldData.getString(DEVICE_LIST));
+        double oldPipLength = oldPipData.stream().mapToDouble(item -> JSON.parseObject(item.toString()).getDoubleValue(PIPE_LENGTH)).sum();
         List<String> oldPipDataRecords = oldPipData.stream().map(item -> JSON.parseObject(item.toString()).getString(RECORD)).collect(Collectors.toList());
         List<String> nowPipDataRecords = idxBizJgProjectContraptionMapper.selectEquipList(notice.getProjectContraptionId()).stream().map(item -> String.valueOf(item.get("record"))).collect(Collectors.toList());
         List<JSONObject> toAddPipData = alreadyDelPipData.stream().map(item -> JSON.parseObject(item.toString())).collect(Collectors.toList());
         List<String> toDeletePipRecords = nowPipDataRecords.stream().filter(item -> !oldPipDataRecords.contains(item)).collect(Collectors.toList());
         this.addPipDataWithFlowPass(toAddPipData, notice);
         this.delPipDataWithFlowPass(toDeletePipRecords);
+        LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<IdxBizJgProjectContraption>()
+                .eq(IdxBizJgProjectContraption::getSequenceNbr, notice.getProjectContraptionId())
+                .set(IdxBizJgProjectContraption::getPipelineLength, oldPipLength)
+                .set(IdxBizJgProjectContraption::getPipeLengthChanged, 0);
+        idxBizJgProjectContraptionMapper.update(null, updateWrapper);
     }
 
     private void finishedTask(JgReformNotice reformNotice) {