fix(jg):气瓶认领单瓶容积为空报错

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -1144,7 +1144,6 @@
         <if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''">
             and ui."DATA_SOURCE" like 'jg%'
         </if>
-        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
         </if>
@@ -1291,7 +1290,6 @@
                 </otherwise>
             </choose>
         </if>
-        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
             -- 限制 没有做过使用登记的
@@ -1348,7 +1346,6 @@
         <if test="jsonObject.informationManageCode != null and jsonObject.informationManageCode != ''">
             and oi.INFORMATION_MANAGE_CODE like concat('%',#{jsonObject.informationManageCode},'%')
         </if>
-        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
         </if>
@@ -1400,7 +1397,6 @@
         <if test="jsonObject.informationManageCode != null and jsonObject.informationManageCode != ''">
             and oi.INFORMATION_MANAGE_CODE like concat('%',#{jsonObject.informationManageCode},'%')
         </if>
-        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
         </if>

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

@@ -4307,7 +4307,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     @Transactional(rollbackFor = Exception.class)
     public Object savePressureVesselData(Map<String, Object> paramMap) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
@@ -4688,24 +4687,39 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                             .collect(Collectors.toList())
             );
         }
-        batchInsert(idxBizJgSupervisionInfoMapper, supervisionInfoList, "监督信息");
         batchInsert(idxBizJgUseInfoMapper, useInfoList, "使用信息");
-        batchInsert(idxBizJgDesignInfoMapper, designInfoList, "设计信息");
         batchInsert(idxBizJgRegisterInfoMapper, registerInfoList, "注册信息");
-        batchInsert(idxBizJgFactoryInfoMapper, factoryInfoList, "制造信息");
-        batchInsert(otherInfoMapper, otherInfoList, "其他信息");
-        batchInsert(idxBizJgTechParamsVesselMapper, paramsVesselList, "容器参数信息");
-        batchInsert(idxBizJgInspectionDetectionInfoMapper, inspectionDetectionInfoList, "检验检测信息");
-        batchInsert(certificateChangeRecordEqMapper, jgCertificateChangeRecordEqList, "登记证关系信息");
-        esEquipmentCategory.saveAll(esEquipmentCategoryList);
-        eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_EQUIP.name(), recordSet, EquipCreateOrEditEvent.EquipType.equip));
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+        futures.add(CompletableFuture.runAsync(() -> batchInsert(idxBizJgSupervisionInfoMapper, supervisionInfoList, "监督信息"), executor));
+        futures.add(CompletableFuture.runAsync(() -> batchInsert(idxBizJgDesignInfoMapper, designInfoList, "设计信息"), executor));
+        futures.add(CompletableFuture.runAsync(() -> batchInsert(idxBizJgFactoryInfoMapper, factoryInfoList, "制造信息"), executor));
+        futures.add(CompletableFuture.runAsync(() -> batchInsert(otherInfoMapper, otherInfoList, "其他信息"), executor));
+        futures.add(CompletableFuture.runAsync(() -> batchInsert(idxBizJgTechParamsVesselMapper, paramsVesselList, "容器参数信息"), executor));
+        futures.add(CompletableFuture.runAsync(() -> batchInsert(idxBizJgInspectionDetectionInfoMapper, inspectionDetectionInfoList, "检验检测信息"), executor));
+        futures.add(CompletableFuture.runAsync(() -> batchInsert(certificateChangeRecordEqMapper, jgCertificateChangeRecordEqList, "登记证关系信息"), executor));
+
+        futures.add(CompletableFuture.runAsync(() -> esEquipmentCategory.saveAll(esEquipmentCategoryList), executor));
+
+        futures.add(CompletableFuture.runAsync(() ->
+                eventPublisher.publish(
+                        new EquipCreateOrEditEvent(
+                                this,
+                                BusinessTypeEnum.JG_NEW_EQUIP.name(),
+                                recordSet,
+                                EquipCreateOrEditEvent.EquipType.equip
+                        )
+                ), executor));
+
+        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
         return String.format("导入完成，成功导入: %d 条数据！", useInfoList.size());
     }
+    // 定义线程池，CPU 核数 * 2，避免阻塞主线程
+    ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2);
 
     /** 通用批量插入方法 */
     public <T> void batchInsert(CustomBaseMapper<T> mapper, List<T> list, String name) {
         if (list != null && !list.isEmpty()) {
-            mapper.insertBatchSomeColumn(list, 500);
+            mapper.insertBatchSomeColumn(list, 200);
             log.info("{} 批量插入完成，数量：{}", name, list.size());
         }
     }

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

@@ -47,7 +47,7 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto, JgResu
                     return info;
                 })
                 .collect(Collectors.toList());
-        this.baseMapper.insertBatchSomeColumn(jgResumeInfoCollection,500);
+        this.baseMapper.insertBatchSomeColumn(jgResumeInfoCollection,200);
     }
 
     /**