fix(jg):改造告知-添加没有删除管道的判断

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

@@ -975,8 +975,8 @@ 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(DEVICE_LIST));
-        JSONArray delPipData = JSONArray.parseArray(newData.getString(DEL_DEVICE_LIST));
+        JSONArray newPipData = Optional.ofNullable(JSONArray.parseArray(newData.getString(DEVICE_LIST))).orElse(new JSONArray());
+        JSONArray delPipData = Optional.ofNullable(JSONArray.parseArray(newData.getString(DEL_DEVICE_LIST))).orElse(new JSONArray());
         // JSONObject oldData = JSONObject.parseObject(registrationHistory.getOldData());
         // JSONArray oldPipData = JSONArray.parseArray(oldData.getString(DEVICE_LIST));
         // 1.1更新工程装置中的【管道信息】增加减少或修改管道信息
@@ -1321,10 +1321,10 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             return;
         }
         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_DEVICE_LIST));
-        JSONObject oldData = JSONObject.parseObject(registrationHistory.getOldData());
-        JSONArray oldPipData = JSONArray.parseArray(oldData.getString(DEVICE_LIST));
+        JSONObject newData = Optional.ofNullable(JSONObject.parseObject(registrationHistory.getChangeData())).orElse(new JSONObject());
+        JSONArray alreadyDelPipData = Optional.ofNullable(JSONArray.parseArray(newData.getString(DEL_DEVICE_LIST))).orElse(new JSONArray());
+        JSONObject oldData = Optional.ofNullable(JSONObject.parseObject(registrationHistory.getOldData())).orElse(new JSONObject());
+        JSONArray oldPipData = Optional.ofNullable(JSONArray.parseArray(oldData.getString(DEVICE_LIST))).orElse(new JSONArray());
         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());