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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
@@ -18,9 +19,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 import static com.alibaba.fastjson.JSON.toJSONString;
-import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl.EQU_LIST;
 
 @Slf4j
 @Service
@@ -63,30 +64,37 @@ public class XiAnDataDockServiceImpl {
      * @param equLists 数据集
      * @return 保存结果
      */
+    @Transactional(rollbackFor = Exception.class)
     public boolean saveEquipmentData(List<Map<?, ?>> equLists) {
-        equLists.forEach(equ -> {
-            // 设备的唯一编码
+        // 异步
+        CompletableFuture.allOf(equLists.stream().map(equ ->
+                CompletableFuture.runAsync(() -> {
                     String record = UUID.randomUUID().toString();
+                    String equList = String.valueOf(equ.get("equList"));
+                    // 保存到设备表
+                    saveUseInfo(equ, record);
+                    saveDesignInfo(equ, record);
+                    saveFactoryInfo(equ, record);
+                    saveRegisterInfo(equ, record);
+                    saveSupervisionInfo(equ, record);
+                    saveOtherInfo(equ, record);
+                    // 保存技术参数
+                    saveTechParams(equ, record, equList);
+                    // 保存到ES
+                    saveEquInfoToEs(record);
+                })
+        ).toArray(CompletableFuture[]::new)).join();
 
-            // 设备种类
-            String equList = String.valueOf(equ.get(EQU_LIST));
-
-            // 是否起重机械
-            boolean isQZJX = EquipmentClassifityEnum.QZJX.getCode().equals(equList);
-            // 是否场内机动车辆
-            boolean isCNJDXL = EquipmentClassifityEnum.CC.getCode().equals(equList);
-            // 是否锅炉
-            boolean isGL = EquipmentClassifityEnum.GL.getCode().equals(equList);
-            // 是否压力容器
-            boolean isYLRQ = EquipmentClassifityEnum.YLRQ.getCode().equals(equList);
-            // 是否压力管道
-            boolean isYLGD = EquipmentClassifityEnum.YLGD.getCode().equals(equList);
-            // 是否大型游乐设施
-            boolean isDXYNSS = EquipmentClassifityEnum.YLSS.getCode().equals(equList);
-            // 是否客运索道
-            boolean isKYSD = EquipmentClassifityEnum.KYSD.getCode().equals(equList);
-
-            // 使用信息
+        return Boolean.TRUE;
+    }
+
+    /**
+     * 保存使用信息表
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveUseInfo(Map<?, ?> equ, String record) {
         IdxBizJgUseInfo useInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgUseInfo.class);
         if (!ValidationUtil.isEmpty(useInfo)) {
             useInfo.setRecDate(new Date());
@@ -96,28 +104,47 @@ public class XiAnDataDockServiceImpl {
             useInfo.setIsIntoManagement(Boolean.FALSE);
             useInfo.setUseUnitCreditCode(String.valueOf(equ.get("useUnitCode")));
             useInfo.setUseUnitName(String.valueOf(equ.get("useUnit")));
-//                if("8300".equals(equCategory)) { todo
-//                    useInfo.setProjectContraption(((String) equipmentInfoForm.get("PROJECT_CONTRAPTION")).trim());
-//                }
             idxBizJgUseInfoService.save(useInfo);
         }
-            // 设计信息
+    }
+
+    /**
+     * 保存设计信息表
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveDesignInfo(Map<?, ?> equ, String record) {
         IdxBizJgDesignInfo designInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgDesignInfo.class);
         if (!ValidationUtil.isEmpty(designInfo)) {
             designInfo.setRecord(record);
             designInfo.setRecDate(new Date());
             idxBizJgDesignInfoService.save(designInfo);
         }
+    }
 
-            // 制造信息
+    /**
+     * 保存制造信息
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveFactoryInfo(Map<?, ?> equ, String record) {
         IdxBizJgFactoryInfo factoryInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgFactoryInfo.class);
         if (!ValidationUtil.isEmpty(factoryInfo)) {
             factoryInfo.setRecord(record);
             factoryInfo.setRecDate(new Date());
             idxBizJgFactoryInfoService.save(factoryInfo);
         }
+    }
 
-            // 注册登记信息
+    /**
+     * 保存注册登记信息表
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveRegisterInfo(Map<?, ?> equ, String record) {
         IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgRegisterInfo.class);
         if (!ValidationUtil.isEmpty(registerInfo)) {
             registerInfo.setRecord(record);
@@ -125,16 +152,30 @@ public class XiAnDataDockServiceImpl {
             registerInfo.setRegisterState("6045");
             idxBizJgRegisterInfoServiceImpl.save(registerInfo);
         }
+    }
 
-            // 监督管理
+    /**
+     * 保存监督管理信息表
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveSupervisionInfo(Map<?, ?> equ, String record) {
         IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgSupervisionInfo.class);
         if (!ValidationUtil.isEmpty(supervisionInfo)) {
             supervisionInfo.setRecord(record);
             supervisionInfo.setRecDate(new Date());
             idxBizJgSupervisionInfoService.save(supervisionInfo);
         }
+    }
 
-            // 其他信息
+    /**
+     * 保存其他信息表
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveOtherInfo(Map<?, ?> equ, String record) {
         IdxBizJgOtherInfo otherInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgOtherInfo.class);
         if (!ValidationUtil.isEmpty(otherInfo)) {
             otherInfo.setRecord(record);
@@ -142,56 +183,132 @@ public class XiAnDataDockServiceImpl {
             otherInfo.setRecDate(new Date());
             idxBizJgOtherInfoService.save(otherInfo);
         }
+    }
 
-            // 起重机械  技术参数
-            if (isQZJX) {
+    /**
+     * 保存技术参数
+     *
+     * @param equ
+     * @param record
+     * @param equList
+     */
+    private void saveTechParams(Map<?, ?> equ, String record, String equList) {
+        if (EquipmentClassifityEnum.QZJX.getCode().equals(equList)) {
+            saveLiftingParams(equ, record);
+        } else if (EquipmentClassifityEnum.CC.getCode().equals(equList)) {
+            saveVehicleParams(equ, record);
+        } else if (EquipmentClassifityEnum.GL.getCode().equals(equList)) {
+            saveBoilerParams(equ, record);
+        } else if (EquipmentClassifityEnum.YLRQ.getCode().equals(equList)) {
+            saveVesselParams(equ, record);
+        } else if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
+            savePipelineParams(equ, record);
+        } else if (EquipmentClassifityEnum.YLSS.getCode().equals(equList)) {
+            saveRidesParams(equ, record);
+        } else if (EquipmentClassifityEnum.KYSD.getCode().equals(equList)) {
+            saveRopewayParams(equ, record);
+        }
+    }
+
+    /**
+     * 保存起重机械技术参数
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveLiftingParams(Map<?, ?> equ, String record) {
         EquipTechParamLifting equipTechParamLifting = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamLifting.class);
+        if (!ValidationUtil.isEmpty(equipTechParamLifting)) {
             equipTechParamLifting.setRecord(record);
             equipTechParamLiftingMapper.insert(equipTechParamLifting);
         }
-            // 场内机动车辆  技术参数
-            if (isCNJDXL) {
+    }
+
+    /**
+     * 保存场内机动车辆技术参数
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveVehicleParams(Map<?, ?> equ, String record) {
         EquipTechParamVehicle equipTechParamVehicle = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamVehicle.class);
+        if (!ValidationUtil.isEmpty(equipTechParamVehicle)) {
             equipTechParamVehicle.setRecord(record);
             equipTechParamVehicleMapper.insert(equipTechParamVehicle);
         }
-            // 锅炉  技术参数
-            if (isGL) {
+    }
+
+    /**
+     * 保存锅炉技术参数
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveBoilerParams(Map<?, ?> equ, String record) {
         EquipTechParamBoiler equipTechParamBoiler = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamBoiler.class);
+        if (!ValidationUtil.isEmpty(equipTechParamBoiler)) {
             equipTechParamBoiler.setRecord(record);
             equipTechParamBoilerMapper.insert(equipTechParamBoiler);
         }
-            // 压力容器  技术参数
-            if (isYLRQ) {
+    }
+
+    /**
+     * 保存压力容器技术参数
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveVesselParams(Map<?, ?> equ, String record) {
         EquipTechParamVessel equipTechParamVessel = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamVessel.class);
+        if (!ValidationUtil.isEmpty(equipTechParamVessel)) {
             equipTechParamVessel.setRecord(record);
             equipTechParamVesselMapper.insert(equipTechParamVessel);
         }
-            // 压力管道  技术参数
-            if (isYLGD) {
+    }
+
+    /**
+     * 保存压力管道技术参数
+     *
+     * @param equ
+     * @param record
+     */
+    private void savePipelineParams(Map<?, ?> equ, String record) {
         EquipTechParamPipeline equipTechParamPipeline = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamPipeline.class);
+        if (!ValidationUtil.isEmpty(equipTechParamPipeline)) {
             equipTechParamPipeline.setRecord(record);
             equipTechParamPipelineMapper.insert(equipTechParamPipeline);
         }
-            // 大型游乐设施  技术参数
-            if (isDXYNSS) {
+    }
+
+    /**
+     * 保存大型游乐设施技术参数
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveRidesParams(Map<?, ?> equ, String record) {
         EquipTechParamRides equipTechParamRides = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamRides.class);
+        if (!ValidationUtil.isEmpty(equipTechParamRides)) {
             equipTechParamRides.setRecord(record);
             equipTechParamRidesMapper.insert(equipTechParamRides);
         }
-            // 客运索道  技术参数
-            if (isKYSD) {
+    }
+
+    /**
+     * 保存客运索道技术参数
+     *
+     * @param equ
+     * @param record
+     */
+    private void saveRopewayParams(Map<?, ?> equ, String record) {
         EquipTechParamRopeway equipTechParamRopeway = JSON.parseObject(JSON.toJSONString(equ), EquipTechParamRopeway.class);
+        if (!ValidationUtil.isEmpty(equipTechParamRopeway)) {
             equipTechParamRopeway.setRecord(record);
             equipTechParamRopewayMapper.insert(equipTechParamRopeway);
         }
-
-            // 保存到es
-            saveEquInfoToEs(record);
-        });
-        return Boolean.TRUE;
     }
 
+
     /**
      * 保存设备数据至es
      *
@@ -206,4 +323,5 @@ public class XiAnDataDockServiceImpl {
             esEquipmentCategory.save(equipmentCategoryDto);
         }
     }
+
 }