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

@@ -1606,32 +1606,32 @@ public class DataDockServiceImpl {
         try {
             log.info("解析第{}行数据：{}", rowIndex, JSON.toJSONString(data));
             checkNotBlank(data.getPipeName(), "管道名称不能为空；", rowError);
-            checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
-            checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
-            checkNotBlank(data.getInspectOrgCode(), "检验检测机构统一社会信用代码不能为空；", rowError);
-            checkNotBlank(data.getInspectOrgName(), "检验检测机构名称不能为空；", rowError);
-            checkNotBlank(data.getInspectConclusion(), "检验结论不能为空；", rowError);
-            checkNotBlank(data.getInspectType(), "检验类型不能为空；", rowError);
-            checkNotBlank(data.getInspectDate(), "检验日期不能为空；", rowError);
-            Optional.ofNullable(data.getInspectDate()).ifPresent(v -> checkDateFormatCorrect(v, "检验日期格式不正确；", rowError));
-            checkNotBlank(data.getInspectStaff(), "检验人员名称不能为空；", rowError);
-            checkNotBlank(data.getNextInspectDate(), "下次检验日期不能为空；", rowError);
-            Optional.ofNullable(data.getNextInspectDate()).ifPresent(v -> checkDateFormatCorrect(v, "下次检验日期格式不正确；", rowError));
-            checkNotBlank(data.getInspectReportNo(), "检验报告编号不能为空；", rowError);
-            checkNotBlank(data.getUscUnitCreditCode(), "安装单位统一社会信用代码不能为空；", rowError);
-            checkNotBlank(data.getUscUnitName(), "安装单位名称不能为空；", rowError);
-            checkNotBlank(data.getUscDate(), "安装年月不能为空", rowError);
+            //checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
+            //checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
+            //checkNotBlank(data.getInspectOrgCode(), "检验检测机构统一社会信用代码不能为空；", rowError);
+            //checkNotBlank(data.getInspectOrgName(), "检验检测机构名称不能为空；", rowError);
+            //checkNotBlank(data.getInspectConclusion(), "检验结论不能为空；", rowError);
+            //checkNotBlank(data.getInspectType(), "检验类型不能为空；", rowError);
+            //checkNotBlank(data.getInspectDate(), "检验日期不能为空；", rowError);
+            //Optional.ofNullable(data.getInspectDate()).ifPresent(v -> checkDateFormatCorrect(v, "检验日期格式不正确；", rowError));
+            //checkNotBlank(data.getInspectStaff(), "检验人员名称不能为空；", rowError);
+            //checkNotBlank(data.getNextInspectDate(), "下次检验日期不能为空；", rowError);
+            //Optional.ofNullable(data.getNextInspectDate()).ifPresent(v -> checkDateFormatCorrect(v, "下次检验日期格式不正确；", rowError));
+            //checkNotBlank(data.getInspectReportNo(), "检验报告编号不能为空；", rowError);
+            //checkNotBlank(data.getUscUnitCreditCode(), "安装单位统一社会信用代码不能为空；", rowError);
+            //checkNotBlank(data.getUscUnitName(), "安装单位名称不能为空；", rowError);
+            //checkNotBlank(data.getUscDate(), "安装年月不能为空", rowError);
             // 技术参数
-            checkNotBlank(data.getWallThickness(), "公称壁厚不能为空；", rowError);
-            Optional.ofNullable(data.getWallThickness()).ifPresent(item -> checkPipeSpecifications(item, "公称壁厚请输入数字或者/分割的范围，如2/6；", rowError));
-            checkNotBlank(data.getNominalDiameter(), "公称直径不能为空；", rowError);
-            Optional.ofNullable(data.getNominalDiameter()).ifPresent(item -> checkPipeSpecifications(item, "公称直径请输入数字或者/分割的范围，如2/6；", rowError));
-            checkNotBlank(data.getPipeLength(), "管道长度不能为空；", rowError);
-            Optional.ofNullable(data.getPipeLength()).ifPresent(item -> checkDateFormatNumber(item, "管道长度必须为数字", rowError));
-            checkNotBlank(data.getPressure(), "设计-压力不能为空；", rowError);
-            checkNotBlank(data.getMedium(), "设计-介质不能为空；", rowError);
-            checkNotBlank(data.getTemperature(), "设计-温度不能为空；", rowError);
-            checkNotBlank(data.getPipelineNumber(), "管道编号不能为空；", rowError);
+            //checkNotBlank(data.getWallThickness(), "公称壁厚不能为空；", rowError);
+            //Optional.ofNullable(data.getWallThickness()).ifPresent(item -> checkPipeSpecifications(item, "公称壁厚请输入数字或者/分割的范围，如2/6；", rowError));
+            //checkNotBlank(data.getNominalDiameter(), "公称直径不能为空；", rowError);
+            //Optional.ofNullable(data.getNominalDiameter()).ifPresent(item -> checkPipeSpecifications(item, "公称直径请输入数字或者/分割的范围，如2/6；", rowError));
+            //checkNotBlank(data.getPipeLength(), "管道长度不能为空；", rowError);
+            //Optional.ofNullable(data.getPipeLength()).ifPresent(item -> checkDateFormatNumber(item, "管道长度必须为数字", rowError));
+            //checkNotBlank(data.getPressure(), "设计-压力不能为空；", rowError);
+            //checkNotBlank(data.getMedium(), "设计-介质不能为空；", rowError);
+            //checkNotBlank(data.getTemperature(), "设计-温度不能为空；", rowError);
+            //checkNotBlank(data.getPipelineNumber(), "管道编号不能为空；", rowError);
             Optional.ofNullable(data.getPipelineNumber()).ifPresent(v -> {
                 if (pipelineNumList.contains(v)) {
                     rowError.append("管道编号不能重复");
@@ -1639,7 +1639,7 @@ public class DataDockServiceImpl {
                     pipelineNumList.add(v);
                 }
             });
-            checkNotBlank(data.getDeviceLevel(), "管道级别不能为空；", rowError);
+            //checkNotBlank(data.getDeviceLevel(), "管道级别不能为空；", rowError);
 
 
             // 工业管道校验使用信息
@@ -1900,7 +1900,18 @@ public class DataDockServiceImpl {
                 .setProductPhoto(toJSONString(equipInfo.get("PRODUCT_PHOTO")))
                 .setProductQualificationCertificate(toJSONString(equipInfo.get("PRODUCT_QUALIFICATION_CERTIFICATE")))
                 .setOtherAccessories(ValidationUtil.isEmpty(equipInfo.get("OTHER_ACCESSORIES")) ? null : toJSONString(equipInfo.get("OTHER_ACCESSORIES")))
-                .setPipelineLength(equLists.stream().mapToDouble(item -> Double.parseDouble(item.getPipeLength())).sum())
+                .setPipelineLength(
+                        Optional.ofNullable(equLists)
+                                .orElse(Collections.emptyList())
+                                .stream()
+                                .filter(Objects::nonNull)
+                                .map(PipingExcelDto::getPipeLength)
+                                .filter(Objects::nonNull)
+                                .map(String::trim)
+                                .filter(s -> !s.isEmpty())
+                                .mapToDouble(Double::parseDouble)
+                                .sum()
+                )
                 .setInspectUnitCreditCode(inspectUnitCreditCode)
                 .setInspectUnitName(inspectUnitName)
                 .setStartLatitudeLongitude(toJSONString(equipInfo.get("startLatitudeLongitude")))

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

@@ -1118,6 +1118,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             resultMap.put(EQUIP_CLASS_FORM_ID, equIpClassMap);
         }
         equipInfoMap.put("companyLevel", companyLevel);
+        equipInfoMap.put("type", equIpClassMap.get("type"));
         // 设备参数
         if (equIpClassMap.containsKey(EQU_LIST) && !ValidationUtil.isEmpty(equIpClassMap.get(EQU_LIST).toString())) {
             Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "", equIpClassMap.get(EQU_LIST).toString());
@@ -3642,11 +3643,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private String getDataSource(String operateType, LinkedHashMap equipmentInfoForm) {
         // 数据来源 历史数据his 新数据new
         String equipSource = String.valueOf(equipmentInfoForm.get(DATA_SOURCE));
-        if(OPERATESAVE.equals(operateType)){
-            return "new".equals(equipSource) ? "jg" : "his".equals(equipSource) ? "jg_his" : "jg_his_black";
-        } else {
-            return equipSource;
-        }
+        return "new".equals(equipSource) ? "jg" : "his".equals(equipSource) ? "jg_his" : "jg_his_black";
     }
 
     public void checkEsData(String id) {