Merge remote-tracking branch 'origin/develop_tzs_main' into develop_tzs_test

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/converter/CommonCustomConverter.java

@@ -73,7 +73,7 @@ public class CommonCustomConverter {
          */
         @SuppressWarnings("unchecked")
         public static void refreshCache() {
-            cacheResult = (List<LinkedHashMap<String, Object>>) redisUtils.get("REGULATOR_UNIT_TREE");
+            cacheResult = (List<LinkedHashMap<String, Object>>) redisUtils.get("ADMINISTRATION_UNIT_TREE");
         }
 
         @SuppressWarnings("unchecked")

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

@@ -22,65 +22,6 @@
         </if>
     </select>
 
-    <select id="countEquipInUseTimesWithOutZFBatch" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
-        select
-        sum(inUseNumber) longValue,
-        record as keyStr
-        from (
-        select
-        count(1) as inUseNumber,
-        b.equ_id AS record
-        from
-        tzs_jg_use_registration a,
-        tzs_jg_use_registration_eq b
-        where
-        a.sequence_nbr = b.equip_transfer_id
-        and b.equ_id = ANY(ARRAY[
-        <foreach collection="records" item="record" separator=",">
-            #{record}
-        </foreach>
-        ])
-        and a.is_delete = 0
-        and ( a.status <![CDATA[ <> ]]> '已作废')
-        GROUP BY b.equ_id
-        UNION ALL
-        select
-        count(1) as inUseNumber,
-        b.equ_id  AS record
-        from
-        tzs_jg_installation_notice a,
-        tzs_jg_installation_notice_eq b
-        where
-        a.sequence_nbr = b.equip_transfer_id
-        and b.equ_id = ANY(ARRAY[
-        <foreach collection="records" item="record" separator=",">
-            #{record}
-        </foreach>
-        ])
-        and a.is_delete = 0
-        and (a.notice_status <![CDATA[ <> ]]> '6617')
-        GROUP BY b.equ_id
-        UNION ALL
-        select
-        count(1) as inUseNumber,
-        b.equ_id  AS record
-        from
-        tzs_jg_vehicle_information a,
-        tzs_jg_vehicle_information_eq b
-        where
-        a.sequence_nbr = b.vehicle_id
-        and b.equ_id = ANY(ARRAY[
-        <foreach collection="records" item="record" separator=",">
-            #{record}
-        </foreach>
-        ])
-        and a.is_delete = 0
-        and (a.status <![CDATA[ <> ]]> '已作废')
-        GROUP BY b.equ_id
-        )
-        GROUP BY record
-    </select>
-
     <select id="getUnitInfoListByType" resultType="java.util.Map">
         SELECT sequence_nbr AS useCode,
         CASE
@@ -1117,7 +1058,7 @@
             tt."INFORM_END" as problemTime,
             ui."USE_UNIT_NAME",
             ui."USE_UNIT_CREDIT_CODE",
-            (select unit_type from tz_base_enterprise_info where use_unit_code = ui."USE_UNIT_CREDIT_CODE") unitType,
+            (select unit_type from tz_base_enterprise_info where use_unit_code = ui."USE_UNIT_CREDIT_CODE" and is_delete = '0' limit 1) unitType,
             ri."EQU_LIST",
             (SELECT name FROM tz_equipment_category WHERE code = ri."EQU_LIST") equList,
             (SELECT name FROM tz_equipment_category WHERE code = ri."EQU_CATEGORY") equCategory,
@@ -1128,12 +1069,7 @@
             si."ORG_BRANCH_CODE",
             si."COMPANY_ORG_BRANCH_CODE"
         FROM
-            idx_biz_jg_use_info ui
-        LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
-        LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = ui."RECORD"
-        LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
-        LEFT JOIN tz_base_enterprise_info e on e.use_unit_code = ui."USE_UNIT_CREDIT_CODE"
-        LEFT JOIN (
+            (
                 SELECT
                     "RECORD","INFORM_END","ROWNUM1"
                 FROM
@@ -1143,7 +1079,12 @@
                             idx_biz_jg_maintenance_record_info where "INFORM_END" is not null
                     ) d
                 WHERE d."ROWNUM1" = 1 and  d."INFORM_END" <![CDATA[<]]> to_char(now(), 'YYYY-MM-DD')
-            ) tt on tt."RECORD" = ui."RECORD"
+            ) tt
+        LEFT JOIN idx_biz_jg_use_info ui ON ui."RECORD" = tt."RECORD"
+        LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
+        LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = ui."RECORD"
+        LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
+        LEFT JOIN tz_base_enterprise_info e on e.use_unit_code = ui."USE_UNIT_CREDIT_CODE"
         WHERE si."ORG_BRANCH_CODE" like '50%'
           and oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
           and tt."INFORM_END" is not null
@@ -1157,7 +1098,7 @@
         tt."NEXT_INSPECT_DATE" as problemTime,
         ui."USE_UNIT_NAME",
         ui."USE_UNIT_CREDIT_CODE",
-        (select unit_type from tz_base_enterprise_info where use_unit_code = ui."USE_UNIT_CREDIT_CODE") unitType,
+        (select unit_type from tz_base_enterprise_info where use_unit_code = ui."USE_UNIT_CREDIT_CODE" and is_delete = '0' limit 1) unitType,
         ri."EQU_LIST",
         (SELECT name FROM tz_equipment_category WHERE code = ri."EQU_LIST") equList,
         (SELECT name FROM tz_equipment_category WHERE code = ri."EQU_CATEGORY") equCategory,
@@ -1168,25 +1109,32 @@
         si."ORG_BRANCH_CODE",
         si."COMPANY_ORG_BRANCH_CODE"
         FROM
-        idx_biz_jg_use_info ui
-        LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
-        LEFT JOIN idx_biz_jg_supervision_info si on si."RECORD" = ui."RECORD"
-        LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
-        LEFT JOIN tz_base_enterprise_info e on e.use_unit_code = ui."USE_UNIT_CREDIT_CODE"
-        LEFT JOIN (
+        (
             SELECT "RECORD","NEXT_INSPECT_DATE",rowNum1
             FROM
             (
-                SELECT ROW_NUMBER () OVER ( PARTITION BY "RECORD" ORDER BY "INSPECT_DATE" DESC, REC_DATE DESC) AS rowNum1,"RECORD", "NEXT_INSPECT_DATE"
+                SELECT ROW_NUMBER () OVER ( PARTITION BY "RECORD" ORDER BY "INSPECT_DATE" DESC, "REC_DATE" DESC) AS rowNum1,"RECORD", "NEXT_INSPECT_DATE"
                 FROM
                 idx_biz_jg_inspection_detection_info where "NEXT_INSPECT_DATE" is not null
+                AND NOT EXISTS (
+                    SELECT 1
+                    FROM tzs_safety_problem_tracing s
+                    WHERE s.source_id = "RECORD"
+                    AND s.problem_status = '未处理'
+                    AND s.problem_type = '检验超期'
+                )
             ) d
             WHERE d.rowNum1 =1 and  d."NEXT_INSPECT_DATE" <![CDATA[<]]> to_char(now(), 'YYYY-MM-DD')
-        ) tt on tt."RECORD" = ui."RECORD"
+        ) tt
+        LEFT JOIN idx_biz_jg_use_info ui ON tt."RECORD" = ui."RECORD"
+        LEFT JOIN idx_biz_jg_other_info oi ON oi."RECORD" = ui."RECORD"
+        LEFT JOIN idx_biz_jg_supervision_info si ON si."RECORD" = ui."RECORD"
+        LEFT JOIN idx_biz_jg_register_info ri ON ri."RECORD" = ui."RECORD"
+        LEFT JOIN tz_base_enterprise_info e ON e.use_unit_code = ui."USE_UNIT_CREDIT_CODE"
         WHERE si."ORG_BRANCH_CODE" like '50%'
           AND oi."CLAIM_STATUS" not in ('草稿','已拒领','待认领')
           AND tt."NEXT_INSPECT_DATE" is not null
-          and e.is_delete = '0'
+          AND e.is_delete = '0'
     </select>
     <select id="countBizFinishedNumForDP" resultType="java.lang.Long">
         SELECT count(1) FROM "tzs_jg_installation_notice" where receive_company_org_code like CONCAT(#{orgCode}, '%') and notice_status = '6616'

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/ElasticSearchClientConfig.java

@@ -36,7 +36,9 @@ public class ElasticSearchClientConfig {
             RestClientBuilder builder = RestClient.builder(httpHosts);
             builder.setHttpClientConfigCallback(httpClientBuilder -> {
                 httpClientBuilder.disableAuthCaching();
-                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider)
+                        .setMaxConnTotal(200)
+                        .setMaxConnPerRoute(60);
             });
             // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
             builder.setRequestConfigCallback(requestConfigBuilder -> {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/discardOrder/strategy/UseRegisterDiscardOrderCheck.java

@@ -5,8 +5,8 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.discardOrder.factory.support.SupportableDiscardOrderCheck;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -26,13 +26,13 @@ public class UseRegisterDiscardOrderCheck implements SupportableDiscardOrderChec
         if (records.isEmpty()) {
             throw new RuntimeException("单据下不存在设备，不能进行作废，请联系管理员！");
         }
-        List<JgUseRegistrationEq> useRegistrationEqs = useRegistrationMapper.selectListForSelfDiscard(records);
+        List<JgUseRegistrationEq> useRegistrationEqs = ListUtils.partition(records, 1000).stream()
+                .flatMap(batch -> useRegistrationMapper.selectListForSelfDiscard(batch).stream())
+                .collect(Collectors.toList());
         if (!useRegistrationEqs.isEmpty()) {
             String msg = String.format("存在设备正在办理或已办理后续业务：%s，不能进行作废！", String.join(",", useRegistrationEqs.stream().map(u -> GenericDiscardOrderCheck.buildErrorMsg(u.getRecUserName())).collect(Collectors.toSet())));
             throw new RuntimeException(msg);
         }
         return true;
     }
-
-
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/useRegister/UseRegisterUpdateService.java

@@ -12,12 +12,14 @@ import com.yeejoin.amos.boot.module.jg.api.dto.PipelineChangeItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
 import com.yeejoin.amos.boot.module.jg.biz.edit.constant.EditConstant;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.strategy.IBizDataChangeHandleStrategy;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService;
 import com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.PieLineDataChangeServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgRegistrationHistoryServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationEqServiceImpl;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
@@ -34,10 +36,15 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.yeejoin.amos.boot.module.jg.api.enums.CertificateStatusEnum.YIDENGJI;
+
 @Service
 @RequiredArgsConstructor
 @Getter
@@ -56,6 +63,8 @@ public class UseRegisterUpdateService {
 
     private final JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
 
+    private final JgUseRegistrationManageServiceImpl jgUseRegistrationManageService;
+
     public void updateBizInfo(List<FieldChangeMeta> allChangeColumns, String bizId, String applyNo, IBizDataChangeHandleStrategy.ModelType model, Map<String, List<PipelineChangeItemDto>> pipelineChangeItemMap) {
         if (model.equals(IBizDataChangeHandleStrategy.ModelType.singleEquip)) {
             JgUseRegistration useRegistration = jgUseRegistrationService.getOne(new LambdaQueryWrapper<JgUseRegistration>().select(BaseEntity::getSequenceNbr, JgUseRegistration::getStatus).eq(JgUseRegistration::getApplyNo, applyNo));
@@ -118,9 +127,13 @@ public class UseRegisterUpdateService {
             if (ValidationUtil.isEmpty(useRegistrationMap)) {
                 return;
             }
-
-            JgUseRegistration jgUseRegistration = jgUseRegistrationService.getById(MapUtils.getString(useRegistrationMap, "UseRegistratSequenceNbr"));
-            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getDteailByRecord(bizId, MapUtils.getString(useRegistrationMap, "UseRegistratSequenceNbr"));
+            String useRegistrationSeq = MapUtils.getString(useRegistrationMap, "UseRegistratSequenceNbr");
+            JgUseRegistration jgUseRegistration = jgUseRegistrationService.getById(useRegistrationSeq);
+            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getDteailByRecord(bizId, useRegistrationSeq);
+            JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
+                    .eq(JgUseRegistrationManage::getUseRegistrationCode, idxBizJgRegisterInfo.getUseOrgCode())
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
+                    .eq(JgUseRegistrationManage::getCertificateStatus,YIDENGJI.getName()).one();
             allChangeColumns.forEach(meta -> {
                 if (!ValidationUtil.isEmpty(jgUseRegistration)) {
                     // 更新接收机构
@@ -156,6 +169,16 @@ public class UseRegisterUpdateService {
                     }
                     jgRegistrationHistoryService.updateById(jgRegistrationHistory);
                 }
+                // 更新登记证登记机关
+                if (!ValidationUtil.isEmpty(jgUseRegistrationManage)) {
+                    if ("receiveCompanyCode".equals(meta.getColumnKey())) {
+                        String receiveCompanyCode = meta.getColumnNewValue();
+                        if (receiveCompanyCode != null) {
+                            jgUseRegistrationManage.setReceiveCompanyCode(receiveCompanyCode);
+                            jgUseRegistrationManage.setReceiveOrgName(CommonCustomConverter.CompanyCodeConverter.getNameByCode(receiveCompanyCode));
+                        }
+                    }
+                }
             });
         }
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/EquipChangeDataUpdateServiceImpl.java

@@ -20,6 +20,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.Date;
@@ -324,6 +325,9 @@ public class EquipChangeDataUpdateServiceImpl {
             esEquipmentCategoryDto.setUSE_PLACE(equipUseInfoChangeDataDto.getProvinceName() + "/" + equipUseInfoChangeDataDto.getCityName() + "/" + equipUseInfoChangeDataDto.getCountyName() + "/" + equipUseInfoChangeDataDto.getStreetName());
             esEquipmentCategoryDto.setUSE_PLACE_CODE(equipUseInfoChangeDataDto.getProvince() + "#" + equipUseInfoChangeDataDto.getCity() + "#" + equipUseInfoChangeDataDto.getCounty() + "#" + equipUseInfoChangeDataDto.getFactoryUseSiteStreet());
             esEquipmentCategoryDto.setADDRESS(equipUseInfoChangeDataDto.getAddress());
+            if (!ValidationUtil.isEmpty(equipUseInfoChangeDataDto.getEquState())) {
+                esEquipmentCategoryDto.setEQU_STATE(Integer.parseInt(equipUseInfoChangeDataDto.getEquState()));
+            }
             esEquipmentCategory.save(esEquipmentCategoryDto);
         }
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleEquipChangeProcess.java

@@ -82,7 +82,7 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
                     .eq(JgUseRegistrationManage::getIsDelete,0)
                     .eq(JgUseRegistrationManage::getCertificateStatus,YIDENGJI.getName())
                     .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode).one();
-            useInfoNew.setReceiveCompanyCode(jgUseRegistrationManage.getReceiveCompanyCode());
+            useInfoOld.setReceiveCompanyCode(jgUseRegistrationManage.getReceiveCompanyCode());
         }
 
         // 历史有证设备检验（台套类设备+气瓶）

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

@@ -2022,7 +2022,13 @@ public class DataHandlerServiceImpl {
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
         if (!records.isEmpty() && isDelete) {
-            superviseInfoMapper.deleteDataAll(records);
+            int batchSize = 1000;
+            for (int i = 0; i < records.size(); i += batchSize) {
+                int end = Math.min(i + batchSize, records.size());
+                List<String> batch = records.subList(i, end);
+                superviseInfoMapper.deleteDataAll(batch);
+                deleteFromEs(batch);
+            }
         }
         return records.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/JgChangeVehicleRegistrationUnitServiceImpl.java

@@ -874,16 +874,17 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     })
     public Map<String, Object> getEquList(String useRegistrationCode) {
         HashMap<String, Object> map = new HashMap<>();
-        // 组件回显
         map.put("useRegistrationCode", useRegistrationCode);
-        JgUseRegistrationManage registrationManage = jgUseRegistrationManageService.lambdaQuery()
+        JgUseRegistrationManage registrationManage =
+                jgUseRegistrationManageService.lambdaQuery()
                         .eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
-                .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
-                .eq(JgUseRegistrationManage::getIsDelete,0)
+                        .eq(JgUseRegistrationManage::getIsDelete, 0)
+                        .last("LIMIT 1")
                         .one();
-        List<JSONObject> jsonObjects = jgUseRegistrationManageService.queryEquByCertificateSeq(registrationManage.getSequenceNbr());
+        List<JSONObject> jsonObjects = registrationManage == null ? Collections.emptyList():
+                Optional.ofNullable(jgUseRegistrationManageService.queryEquByCertificateSeq(registrationManage.getSequenceNbr())
+        ).orElse(Collections.emptyList());
         if (!ObjectUtils.isEmpty(jsonObjects)) {
-//            JgVehicleInformation information = jgVehicleInformationService.lambdaQuery().eq(JgVehicleInformation::getUseRegistrationCode, useRegistrationCode).one();
             List<String> records = jsonObjects.stream().map(a -> String.valueOf(a.get("SEQUENCE_NBR"))).collect(Collectors.toList());
             List<Map<String, Object>> equList = this.getBaseMapper().getEquList(records);
             equList.forEach(a -> {

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

@@ -927,7 +927,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
      * @param map 改造信息
      * @param op  通过或驳回
      */
-    @GlobalTransactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     @Transactional(rollbackFor = Exception.class)
     public void accept(Map<String, Object> map, String op) {
         LinkedHashMap model1 = (LinkedHashMap) map.get("model");

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/ElasticSearchClientConfig.java

@@ -34,7 +34,11 @@ public class ElasticSearchClientConfig {
         try {
             HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
             RestClientBuilder builder = RestClient.builder(httpHosts);
-            builder.setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider));
+            builder.setHttpClientConfigCallback(httpClientBuilder ->
+                    httpClientBuilder
+                            .setDefaultCredentialsProvider(credentialsProvider)
+                            .setMaxConnTotal(200)
+                            .setMaxConnPerRoute(50));
             // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
             builder.setRequestConfigCallback(requestConfigBuilder -> {
                 // 连接超时（默认为1秒）
@@ -43,6 +47,7 @@ public class ElasticSearchClientConfig {
                         .setSocketTimeout(60 * 1000);
             });
 
+
             return new RestHighLevelClient(builder);
         } catch (Exception e) {
             throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -930,8 +930,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     }
 
     private void setResultTypeAndDockInfo(JyjcInspectionApplicationModel applicationModel) {
+        String inspectionUnitCode;
+        String[] inspectionUnit = applicationModel.getInspectionUnitCode().split("_");
+        if (inspectionUnit.length == 2) {
+            inspectionUnitCode = inspectionUnit[0];
+        } else {
+            inspectionUnitCode = applicationModel.getInspectionUnitCode();
+        }
         LambdaQueryWrapper<JyjcOpeningApplication> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(JyjcOpeningApplication::getUnitCode, applicationModel.getInspectionUnitCode());
+        queryWrapper.eq(JyjcOpeningApplication::getUnitCode, inspectionUnitCode);
         queryWrapper.eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getName());
         queryWrapper.select(JyjcOpeningApplication::getResultType, BaseEntity::getSequenceNbr, JyjcOpeningApplication::getDockingUnitCode);
         queryWrapper.orderByDesc(JyjcOpeningApplication::getRecDate);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/config/ElasticSearchClientConfig.java

@@ -36,7 +36,9 @@ public class ElasticSearchClientConfig {
             RestClientBuilder builder = RestClient.builder(httpHosts);
             builder.setHttpClientConfigCallback(httpClientBuilder -> {
                 httpClientBuilder.disableAuthCaching();
-                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider)
+                        .setMaxConnTotal(200)
+                        .setMaxConnPerRoute(60);
             });
             // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
             builder.setRequestConfigCallback(requestConfigBuilder -> {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/config/RestTemplateConfig.java

 package com.yeejoin.amos.boot.module.statistcs.biz.config;
 
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -15,7 +19,18 @@ public class RestTemplateConfig {
 
     @Bean
     @LoadBalanced
-    public RestTemplate getRestTemplate() {
-        return new RestTemplate();
+    public RestTemplate loadBalancedRestTemplate() {
+        PoolingHttpClientConnectionManager manager = new PoolingHttpClientConnectionManager();
+        manager.setMaxTotal(200);
+        manager.setDefaultMaxPerRoute(50);
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setConnectionManager(manager)
+                .build();
+
+        // 2. 创建自定义工厂（最终会被 InterceptingClientHttpRequestFactory 包装）
+        HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(httpClient);
+        factory.setConnectTimeout(5000);
+        factory.setReadTimeout(60000);
+        return new RestTemplate(factory);
     }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubServiceImpl.java

@@ -54,8 +54,7 @@ public class DPSubServiceImpl {
     private static final String GATEWAY_SERVER_NAME = "AMOS-SERVER-GATEWAY";
 
     @Autowired
-    @LoadBalanced
-    private RestTemplate restTemplate;
+    private RestTemplate loadBalancedRestTemplate;
 
     @Autowired
     DataDictionaryServiceImpl iDataDictionaryService;
@@ -857,6 +856,7 @@ public class DPSubServiceImpl {
     }
 
     public ResponseModel getApiResult(JSONObject apiObj, String resultConvert, JSONObject detailResult) {
+        log.info("restTemplate 请求的客户端是：{}", loadBalancedRestTemplate.getRequestFactory().getClass());;
         String url = apiObj.getString("apiPath");
         if(ValidationUtil.isEmpty(url)){
             return null;
@@ -893,19 +893,19 @@ public class DPSubServiceImpl {
                 URI reqUri = new URI(reqUrl);
                 if (StringUtils.contrastLowerStr("GET", reqType)) {
                     responseEntity = reqUrl.contains(GATEWAY_SERVER_NAME)
-                            ? RestTemplateUtils.get(restTemplate, reqUri, httpHeaders, body, String.class, new HashMap<>())
+                            ? RestTemplateUtils.get(loadBalancedRestTemplate, reqUri, httpHeaders, body, String.class, new HashMap<>())
                             : RestTemplateUtils.get(reqUri, httpHeaders, body, String.class, new HashMap<>());
                 } else if (StringUtils.contrastLowerStr("POST", reqType)) {
                     responseEntity = reqUrl.contains(GATEWAY_SERVER_NAME)
-                            ? RestTemplateUtils.post(restTemplate, reqUri, httpHeaders, body, String.class, new HashMap<>())
+                            ? RestTemplateUtils.post(loadBalancedRestTemplate, reqUri, httpHeaders, body, String.class, new HashMap<>())
                             : RestTemplateUtils.post(reqUri, httpHeaders, body, String.class, new HashMap<>());
                 } else if (StringUtils.contrastLowerStr("PUT", reqType)) {
                     responseEntity = reqUrl.contains(GATEWAY_SERVER_NAME)
-                            ? RestTemplateUtils.put(restTemplate, reqUri, httpHeaders, body, String.class)
+                            ? RestTemplateUtils.put(loadBalancedRestTemplate, reqUri, httpHeaders, body, String.class)
                             : RestTemplateUtils.put(reqUri, httpHeaders, body, String.class);
                 } else if (StringUtils.contrastLowerStr("DELETE", reqType)) {
                     responseEntity = reqUrl.contains(GATEWAY_SERVER_NAME)
-                            ? RestTemplateUtils.delete(restTemplate, reqUri, httpHeaders, body, String.class)
+                            ? RestTemplateUtils.delete(loadBalancedRestTemplate, reqUri, httpHeaders, body, String.class)
                             : RestTemplateUtils.delete(reqUri, httpHeaders, body, String.class);
                 }
             } catch (Exception e) {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/config/ElasticSearchClientConfig.java

@@ -34,10 +34,9 @@ public class ElasticSearchClientConfig {
         try {
             HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
             RestClientBuilder builder = RestClient.builder(httpHosts);
-            builder.setHttpClientConfigCallback(httpClientBuilder -> {
-                httpClientBuilder.disableAuthCaching();
-                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-            });
+            builder.setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.disableAuthCaching()
+                    .setDefaultCredentialsProvider(credentialsProvider).setMaxConnTotal(200)
+                    .setMaxConnPerRoute(60));
             // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
             builder.setRequestConfigCallback(requestConfigBuilder -> {
                 // 连接超时（默认为1秒）

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java

@@ -185,7 +185,7 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
      * 设备状态 @see com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum
      */
     @TableField("\"EQU_STATE\"")
-    @FieldDisplayDefine(value = "设备状态")
+    @FieldDisplayDefine(value = "设备状态", dictCode = "SHZT")
     private String equState;
 
     /**

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/config/ElasticSearchClientConfig.java

@@ -34,10 +34,9 @@ public class ElasticSearchClientConfig {
         try {
             HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
             RestClientBuilder builder = RestClient.builder(httpHosts);
-            builder.setHttpClientConfigCallback(httpClientBuilder -> {
-                httpClientBuilder.disableAuthCaching();
-                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-            });
+            builder.setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.disableAuthCaching().setDefaultCredentialsProvider(credentialsProvider)
+                    .setMaxConnTotal(200)
+                    .setMaxConnPerRoute(60));
             // 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
             builder.setRequestConfigCallback(requestConfigBuilder -> {
                 // 连接超时（默认为1秒）