fix(jg):西安数据导入接口修改

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java

@@ -358,8 +358,8 @@ public class XiAnDataDockServiceImpl {
                 data.setWhetherSkidMountedPressureVessel("");
             }
             if (isFixedGasCylinder) { // 是固定式压力容器
-                checkNotBlank(data.getWhetherSphericalTank(), "是否球罐不能为空；", rowError);
-                checkNotBlank(data.getWhetherSkidMountedPressureVessel(), "是否撬装式压力容器不能为空；", rowError);
+//                checkNotBlank(data.getWhetherSphericalTank(), "是否球罐不能为空；", rowError);
+//                checkNotBlank(data.getWhetherSkidMountedPressureVessel(), "是否撬装式压力容器不能为空；", rowError);
                 data.setInformationSituation("");
                 data.setInformationManageCode("");
             }
@@ -384,13 +384,13 @@ public class XiAnDataDockServiceImpl {
         //checkNotBlank(data.getUseUnit(), "使用单位名称不能为空；", rowError);
         // 设计信息
         //checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
-        Optional.ofNullable(data.getDesignUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "设计单位统一社会信用代码格式不正确；", rowError));
+//        Optional.ofNullable(data.getDesignUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "设计单位统一社会信用代码格式不正确；", rowError));
         //checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
         //checkNotBlank(data.getDesignUseDate(), "设计使用年限不能为空；", rowError);
-        Optional.ofNullable(data.getDesignUseDate()).ifPresent(v -> checkDateFormatNumber(v, "设计使用年限不能为数字以外的其他类型；", rowError));
+//        Optional.ofNullable(data.getDesignUseDate()).ifPresent(v -> checkDateFormatNumber(v, "设计使用年限不能为数字以外的其他类型；", rowError));
         //checkNotBlank(data.getDesignUseDate(), "设计日期不能为空；", rowError);
         //Optional.ofNullable(data.getDesignDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计日期格式不正确；", rowError));
-        Optional.ofNullable(data.getAppraisalDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计文件鉴定日期格式不正确；", rowError));
+//        Optional.ofNullable(data.getAppraisalDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计文件鉴定日期格式不正确；", rowError));
         // 制造信息
         //checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空；", rowError);
         //Optional.ofNullable(data.getProduceUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "制造单位统一社会信用代码格式不正确；", rowError));

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

@@ -131,10 +131,11 @@ public class DataDockServiceImpl {
         return Boolean.TRUE;
     }
 
+    @GlobalTransactional(rollbackFor = Exception.class)
     public void saveEquipmentDataInTransaction(Map<String, Object> equ, String dataSource, String remark) {
+        String record = UUID.randomUUID().toString();
         try {
             // transactionTemplate.execute(status -> {
-            String record = UUID.randomUUID().toString();
             String equList = String.valueOf(equ.get("equList"));
             String isCompleteXa = String.valueOf(equ.get("isCompleteXa"));
             // 压力管道保存 工程装置表信息  必须在saveUseInfo之前进行，需要提前生成工程装置id
@@ -153,6 +154,7 @@ public class DataDockServiceImpl {
             // return null;
             // });
         } catch (Exception e) {
+            esEquipmentCategory.deleteById(record);
             e.printStackTrace();
             log.error("{}数据：保存时出现异常，对应数据：{}", dataSource, JSONObject.toJSONString(equ));
             log.error("异常信息：{}", e.getMessage());
@@ -276,10 +278,10 @@ public class DataDockServiceImpl {
             useInfo.setDataSource(dataSource);
             useInfo.setIsNotEs("1");
             useInfo.setIsIntoManagement(Boolean.FALSE);
-            useInfo.setUseUnitCreditCode(String.valueOf(equ.get("useUnitCode")).trim());
-            useInfo.setUseUnitName(String.valueOf(equ.get("useUnit")).trim());
+            useInfo.setUseUnitCreditCode(Objects.toString(equ.get("useUnitCode"), "").trim());
+            useInfo.setUseUnitName(Objects.toString(equ.get("useUnit"), "").trim());
             useInfo.setRemark(remark);
-            useInfo.setProjectContraptionId(String.valueOf(equ.get("projectContraptionId")));
+            useInfo.setProjectContraptionId(Objects.toString(equ.get("projectContraptionId"), ""));
             idxBizJgUseInfoService.save(useInfo);
         }
     }
@@ -478,7 +480,11 @@ public class DataDockServiceImpl {
      * @param record
      */
     private void saveVehicleParams(Map<String, Object> equ, String record) {
-        log.error("数据===>{}", JSONObject.toJSONString(equ));
+        log.info("数据===>{}", JSONObject.toJSONString(equ));
+        Stream.of("seatNumber", "carsNumber", "tractorSeatNumber")
+                .forEach(key -> {
+
+                });
         IdxBizJgTechParamsVehicle equipTechParamVehicle = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgTechParamsVehicle.class);
         if (!ValidationUtil.isEmpty(equipTechParamVehicle)) {
             equipTechParamVehicle.setRecord(record);