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/IdxBizJgRegisterInfoServiceImpl.java

@@ -535,17 +535,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
             //更新时工业管道（8300）检验检测信息
             IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(toJSONString(pipeline), IdxBizJgInspectionDetectionInfo.class);
-            List<Map<String, Object>> inspectionAndTestingInstitutions = commonService.getUnitListByType("inspection", "gasCylindersForCars");
-            Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
-            Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
-            inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
-            inspectionDetectionInfo.setRecord(record);
-            inspectionDetectionInfo.setRecDate(date);
-            inspectionDetectionInfo.setSequenceNbr(null);
-            if (inspectionDetectionInfo.getNextInspectDate() != null) {
-                inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(DateUtil.format(inspectionDetectionInfo.getNextInspectDate(), DatePattern.NORM_DATE_PATTERN)));
+            if (!ValidationUtil.isEmpty(inspectionDetectionInfo)) {
+                List<Map<String, Object>> inspectionAndTestingInstitutions = commonService.getUnitListByType("inspection", "gasCylindersForCars");
+                Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
+                Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
+                inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
+                inspectionDetectionInfo.setRecord(record);
+                inspectionDetectionInfo.setRecDate(date);
+                inspectionDetectionInfo.setSequenceNbr(null);
+                if (inspectionDetectionInfo.getNextInspectDate() != null) {
+                    inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(DateUtil.format(inspectionDetectionInfo.getNextInspectDate(), DatePattern.NORM_DATE_PATTERN)));
+                }
+                inspectionDetectionInfoList.add(inspectionDetectionInfo);
             }
-            inspectionDetectionInfoList.add(inspectionDetectionInfo);
 
             // 使用信息
             IdxBizJgUseInfo useInfo = JSON.parseObject(toJSONString(pipeline), IdxBizJgUseInfo.class);
@@ -617,7 +619,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             registerInfo.setRegisterState(this.getRegCode());
             // 补丁：saveOrUpdate在update数据时不会更新字段为null的字段，但是编辑设备的代码时，从有改成无，equCode解析成null，但是此时需要将equcode删掉
             registerInfo.setEquCode(ObjectUtils.isEmpty(registerInfo.getEquCode()) ? "" : registerInfo.getEquCode());
-            registerInfoList.add(registerInfo);
 
             // 监督管理
             IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(toJSONString(pipeline), IdxBizJgSupervisionInfo.class);
@@ -649,6 +650,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 pipelineInfo.setSequenceNbr(null);
                 paramsPipelineList.add(pipelineInfo);
             }
+            registerInfo.setProductName(pipelineInfo.getPipeName());
+            registerInfoList.add(registerInfo);
 
             ESEquipmentCategoryDto esEquipmentDto = JSON.parseObject(toJSONString(equipmentInfoForm), ESEquipmentCategoryDto.class);
             esEquipmentDto.setDATA_SOURCE(useInfo.getDataSource());