Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/EquipmentClassifityEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@AllArgsConstructor
+@Getter
+public enum EquipmentClassifityEnum {
+
+    /**
+     * *设备分类
+     */
+    GL("锅炉", "1000"),
+    YLRQ("压力容器", "2000"),
+    DT("电梯", "3000"),
+    QZJX("起重机械", "4000"),
+    CC("场（厂）内专用机动车辆", "5000"),
+    YLSS("大型游乐设施", "6000"),
+    YLGDYJ("压力管道元件", "7000"),
+    YLGD("压力管道", "8000"),
+    KYSD("客运索道", "9000"),
+    //树类型
+
+    ZHTJFX("综合统计分析","statistical"),
+
+    //设备认领状态
+    SBRLZT("设备认领状态", "rlzt"),
+    BDLS("八大类树", "eightCategory"),
+    RENLING("其他", "other");
+    private String name;
+    private String code;
+    public static Map<String, String> getName = new HashMap<>();
+    public static Map<String, String> getCode = new HashMap<>();
+
+    static {
+        for (EquipmentClassifityEnum e : EquipmentClassifityEnum.values()) {
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+
+    }
+
+
+    public static String getNameByCode(String code) {
+        for (EquipmentClassifityEnum value : EquipmentClassifityEnum.values()) {
+            if (value.getCode().equals(code)) {
+                return value.getName();
+            }
+        }
+        return "";
+    }
+
+    public static EquipmentClassifityEnum getOne(String code) {
+        for (EquipmentClassifityEnum value : EquipmentClassifityEnum.values()) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/refresh/commonUpdate/BaseEnterpriseUpdate.java → amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/refresh/cm/BaseEnterpriseUpdate.java

-package com.yeejoin.amos.boot.module.common.biz.refresh.commonUpdate;
+package com.yeejoin.amos.boot.module.common.biz.refresh.cm;
 
 import com.yeejoin.amos.boot.module.common.api.entity.EsBaseEnterpriseInfo;
 import lombok.RequiredArgsConstructor;
@@ -23,7 +23,9 @@ public class BaseEnterpriseUpdate {
     public final String jcjgCode = "1233-2";
 
     public String updateJyjcUnitType(String oldUnitType, List<EsBaseEnterpriseInfo.License> unitLicences) {
-
+         if(oldUnitType == null || oldUnitType.isEmpty()) {
+             return oldUnitType;
+         }
         // 如果单位类型中包含检验检测机构、检测单位、检验单位，且有资质信息，则更新单位类型
         if ((oldUnitType.contains(jyjcjg) || oldUnitType.contains(jydw) || oldUnitType.contains(jcdw)) && !ListUtils.isEmpty(unitLicences)) {
             long jydwCount = unitLicences.stream().filter(e -> jyjgCode.equals(e.getCertTypeCode()) || jydw.equals(e.getCertType())).count();

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/utils/RefreshDataUtils.java

 package com.yeejoin.amos.boot.module.common.biz.utils;
 
 import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.boot.module.common.api.enums.EquipmentClassifityEnum;
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class RefreshDataUtils {
 
@@ -32,4 +36,16 @@ public class RefreshDataUtils {
     public static boolean isNullOrEmpty(String str) {
         return str == null || str.trim().isEmpty() || "null".equals(str);
     }
+
+    public static String castEquCategory2Name(String equipTypes) {
+        Set<String> names = new HashSet<>();
+        if(!isNullOrEmpty(equipTypes)){
+            for (String equipType : equipTypes.split(",")) {
+                names.add(EquipmentClassifityEnum.getNameByCode(equipType));
+            }
+        }
+        names.remove("");
+        return String.join(",", names);
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/utils/TechParamUtil.java

@@ -53,28 +53,26 @@ public class TechParamUtil {
     }
 
     public static List<TechParamItem> getParamMetaList(String equListCode, String equCategoryCode, String equDefineCode) {
-        return techParamsMetaMap.computeIfAbsent(equListCode, (key) -> {
-            List<TechParamItem> techParamItems = new ArrayList<>();
-            for (Class<? extends ITechParamDefine> subClass : subClasses) {
-                Field[] fields = subClass.getDeclaredFields();
-                Group group = subClass.getAnnotation(Group.class);
-                if (group != null && equListCode.equals(group.value())) {
-                    for (Field field : fields) {
-                        field.setAccessible(true);
-                        TechnicalParameter technicalParameter = field.getAnnotation(TechnicalParameter.class);
-                        // 设备类别配置空时代表，全部都有
-                        boolean equCategoryMatch = technicalParameter.equCategory().length == 0 || StringUtils.isEmpty(equCategoryCode) || Arrays.asList(technicalParameter.equCategory()).contains(equCategoryCode);
-                        // 设备品种配置空时代表，全部都有
-                        boolean equDefineMatch = technicalParameter.equDefine().length == 0 || StringUtils.isEmpty(equDefineCode) || Arrays.asList(technicalParameter.equDefine()).contains(equDefineCode);
-                        if(equCategoryMatch && equDefineMatch) {
-                            TechParamItem techParamItem = getTechParamItem(equListCode, field);
-                            techParamItems.add(techParamItem);
-                        }
+        List<TechParamItem> techParamItems = new ArrayList<>();
+        for (Class<? extends ITechParamDefine> subClass : subClasses) {
+            Field[] fields = subClass.getDeclaredFields();
+            Group group = subClass.getAnnotation(Group.class);
+            if (group != null && equListCode.equals(group.value())) {
+                for (Field field : fields) {
+                    field.setAccessible(true);
+                    TechnicalParameter technicalParameter = field.getAnnotation(TechnicalParameter.class);
+                    // 设备类别配置空时代表，全部都有
+                    boolean equCategoryMatch = technicalParameter.equCategory().length == 0 || StringUtils.isEmpty(equCategoryCode) || Arrays.asList(technicalParameter.equCategory()).contains(equCategoryCode);
+                    // 设备品种配置空时代表，全部都有
+                    boolean equDefineMatch = technicalParameter.equDefine().length == 0 || StringUtils.isEmpty(equDefineCode) || Arrays.asList(technicalParameter.equDefine()).contains(equDefineCode);
+                    if (equCategoryMatch && equDefineMatch) {
+                        TechParamItem techParamItem = getTechParamItem(equListCode, field);
+                        techParamItems.add(techParamItem);
                     }
                 }
             }
-            return techParamItems;
-        });
+        }
+        return techParamItems;
     }
 
     public static Class<? extends ITechParamDefine> getParamClazz(String equListCode) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/refresh/StatisticsDataUpdateService.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.module.common.api.dto.ITechParamDefine;
 import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem;
 import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
+import com.yeejoin.amos.boot.module.common.biz.utils.RefreshDataUtils;
 import com.yeejoin.amos.boot.module.common.biz.utils.TechParamUtil;
 import com.yeejoin.amos.boot.module.jg.biz.edit.backup.TechParamsBackupService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
@@ -50,34 +51,6 @@ public class StatisticsDataUpdateService {
     }
 
 
-    /**
-     * 判断字符串是否为合法的 JSON 格式
-     */
-    public static boolean isJSONValid(String test) {
-        try {
-            JSON.parseArray(test);
-            return true;
-        } catch (Exception ex) {
-            return false;
-        }
-    }
-
-
-    public static String castStrList2String(String jsonTypesStr) {
-        if (!isNullOrEmpty(jsonTypesStr)) {
-            if (isJSONValid(jsonTypesStr)) {
-                List<String> posts = JSON.parseArray(jsonTypesStr, String.class);
-                return String.join(",", posts);
-            }
-            return jsonTypesStr;
-        }
-        return null;
-    }
-
-    public static boolean isNullOrEmpty(String str) {
-        return str == null || str.trim().isEmpty() || "null".equals(str);
-    }
-
     public static void formatUseDate(Map<String, Object> detail) {
         if (detail.containsKey(USE_DATE_KEY) && detail.get(USE_DATE_KEY) != null) {
             if (detail.get(USE_DATE_KEY).toString().isEmpty() || detail.get(USE_DATE_KEY).toString().equals("null")) {
@@ -98,12 +71,12 @@ public class StatisticsDataUpdateService {
 
     public static void formatInspectDate(ESEquipmentInfo esEquipmentInfo, IdxBizJgInspectionDetectionInfo inspectionDetectionInfo, String record) {
         try {
-            esEquipmentInfo.setINSPECT_DATE(inspectionDetectionInfo.getSequenceNbr() != null ? inspectionDetectionInfo.getInspectDate() != null ? inspectionDetectionInfo.getInspectDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate() : null :null);
+            esEquipmentInfo.setINSPECT_DATE(inspectionDetectionInfo.getSequenceNbr() != null ? inspectionDetectionInfo.getInspectDate() != null ? inspectionDetectionInfo.getInspectDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate() : null : null);
         } catch (Exception e) {
             log.error("INSPECT_DATE时区转换失败：{}", record, e);
         }
         try {
-            esEquipmentInfo.setNEXT_INSPECT_DATE(inspectionDetectionInfo.getSequenceNbr() != null ? inspectionDetectionInfo.getNextInspectDate() != null ? inspectionDetectionInfo.getNextInspectDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()  : null :null);
+            esEquipmentInfo.setNEXT_INSPECT_DATE(inspectionDetectionInfo.getSequenceNbr() != null ? inspectionDetectionInfo.getNextInspectDate() != null ? inspectionDetectionInfo.getNextInspectDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate() : null : null);
         } catch (Exception e) {
             log.error("NEXT_INSPECT_DATE时区转换失败：{}", record, e);
         }

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

@@ -29,7 +29,8 @@ import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.EsBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.EsUserInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
-import com.yeejoin.amos.boot.module.common.biz.refresh.commonUpdate.BaseEnterpriseUpdate;
+import com.yeejoin.amos.boot.module.common.biz.refresh.cm.BaseEnterpriseUpdate;
+import com.yeejoin.amos.boot.module.common.biz.utils.RefreshDataUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeEqDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.PieLineEquipContraptionDto;
@@ -1430,7 +1431,8 @@ public class DataHandlerServiceImpl {
             BeanUtil.copyProperties(enterpriseInfo, esBaseEnterpriseInfo);
             esBaseEnterpriseInfo.setSequenceNbr(enterpriseInfo.getSequenceNbr() + "");
             esBaseEnterpriseInfo.setContactUser(enterpriseInfo.getUseContact());
-            esBaseEnterpriseInfo.setEquipCategory(StatisticsDataUpdateService.castStrList2String(enterpriseInfo.getEquipCategory()));
+            esBaseEnterpriseInfo.setEquipCategory(RefreshDataUtils.castStrList2String(enterpriseInfo.getEquipCategory()));
+            esBaseEnterpriseInfo.setEquipCategoryName(RefreshDataUtils.castEquCategory2Name(esBaseEnterpriseInfo.getEquipCategory()));
             List<TzBaseUnitLicence> unitLicences = licenceMapper.selectList(new LambdaQueryWrapper<TzBaseUnitLicence>()
                     .eq(TzBaseUnitLicence::getUnitCode, enterpriseInfo.getUseUnitCode())
                     .eq(TzBaseUnitLicence::getIsDelete, false));
@@ -1477,10 +1479,11 @@ public class DataHandlerServiceImpl {
             List<EsUserInfo> esUserInfos = tzsUserInfoPage.getRecords().stream().map(u -> {
                 EsUserInfo esUserInfo = new EsUserInfo();
                 BeanUtil.copyProperties(u, esUserInfo);
-                esUserInfo.setPost(StatisticsDataUpdateService.castStrList2String(u.getPost()));
-                esUserInfo.setNewPost(StatisticsDataUpdateService.castStrList2String(u.getNewPost()));
-                esUserInfo.setSubPost(StatisticsDataUpdateService.castStrList2String(u.getSubPost()));
-                esUserInfo.setEquipType(StatisticsDataUpdateService.castStrList2String(u.getEquipType()));
+                esUserInfo.setPost(RefreshDataUtils.castStrList2String(u.getPost()));
+                esUserInfo.setNewPost(RefreshDataUtils.castStrList2String(u.getNewPost()));
+                esUserInfo.setSubPost(RefreshDataUtils.castStrList2String(u.getSubPost()));
+                esUserInfo.setEquipType(RefreshDataUtils.castStrList2String(u.getEquipType()));
+                esUserInfo.setEquipTypeName(RefreshDataUtils.castEquCategory2Name(esUserInfo.getEquipType()));
                 esUserInfo.setUnitType(useCodeEnterpriseMap.getOrDefault(u.getUnitCode(), new TzBaseEnterpriseInfo()).getUnitType());
                 esUserInfo.setSuperviseOrgName(useCodeEnterpriseMap.getOrDefault(u.getUnitCode(), new TzBaseEnterpriseInfo()).getSuperviseOrgName());
                 esUserInfo.setSuperviseOrgCode(useCodeEnterpriseMap.getOrDefault(u.getUnitCode(), new TzBaseEnterpriseInfo()).getSuperviseOrgCode());
@@ -1499,8 +1502,8 @@ public class DataHandlerServiceImpl {
         return permissions.stream().map(p -> {
             EsUserInfo.License license = new EsUserInfo.License();
             BeanUtil.copyProperties(p, license);
-            license.setPermissionItem(StatisticsDataUpdateService.castStrList2String(p.getPermissionItem()));
-            license.setJobItem(StatisticsDataUpdateService.castStrList2String(p.getJobItem()));
+            license.setPermissionItem(RefreshDataUtils.castStrList2String(p.getPermissionItem()));
+            license.setJobItem(RefreshDataUtils.castStrList2String(p.getJobItem()));
             return license;
         }).collect(Collectors.toList());
     }

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

@@ -380,8 +380,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                             String fuzzyValue = String.valueOf(v);
                             BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
                             queryBuilder.should(QueryBuilders.wildcardQuery("name", "*" + fuzzyValue + "*"));
-                            queryBuilder.should(QueryBuilders.wildcardQuery("postName", "*" + fuzzyValue + "*"));
-                            queryBuilder.should(QueryBuilders.wildcardQuery("subPostName", "*" + fuzzyValue + "*"));
+                            queryBuilder.should(QueryBuilders.matchQuery("postName", fuzzyValue));
+                            queryBuilder.should(QueryBuilders.matchQuery("subPostName", fuzzyValue));
                             queryBuilder.should(QueryBuilders.wildcardQuery("unitName", "*" + fuzzyValue + "*"));
                             queryBuilder.should(QueryBuilders.wildcardQuery("equipCategoryName", "*" + fuzzyValue + "*"));
                             queryBuilder.should(QueryBuilders.wildcardQuery("superviseOrgName", "*" + fuzzyValue + "*"));

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java

@@ -10,7 +10,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.EsUserInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsDataRefreshMessage;
 import com.yeejoin.amos.boot.module.common.api.service.IDataRefreshHandler;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
-import com.yeejoin.amos.boot.module.common.biz.refresh.commonUpdate.BaseEnterpriseUpdate;
+import com.yeejoin.amos.boot.module.common.biz.refresh.cm.BaseEnterpriseUpdate;
 import com.yeejoin.amos.boot.module.common.biz.utils.RefreshDataUtils;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseUnitLicence;
@@ -70,6 +70,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
                 esBaseEnterpriseInfo.setSequenceNbr(enterpriseInfo.getSequenceNbr() + "");
                 esBaseEnterpriseInfo.setContactUser(enterpriseInfo.getUseContact());
                 esBaseEnterpriseInfo.setEquipCategory(RefreshDataUtils.castStrList2String(enterpriseInfo.getEquipCategory()));
+                esBaseEnterpriseInfo.setEquipCategoryName(RefreshDataUtils.castEquCategory2Name(esBaseEnterpriseInfo.getEquipCategory()));
                 List<TzBaseUnitLicence> unitLicences = licenceMapper.selectList(new LambdaQueryWrapper<TzBaseUnitLicence>().eq(TzBaseUnitLicence::getUnitCode, enterpriseInfo.getUseUnitCode()).eq(TzBaseUnitLicence::getIsDelete, false));
                 List<EsBaseEnterpriseInfo.License> licenses = unitLicences.stream().map(lis -> {
                     EsBaseEnterpriseInfo.License esLicense = new EsBaseEnterpriseInfo.License();

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/UserRefreshHandler.java

@@ -61,6 +61,7 @@ public class UserRefreshHandler implements IDataRefreshHandler {
                 esUserInfo.setNewPost(RefreshDataUtils.castStrList2String(userInfo.getNewPost()));
                 esUserInfo.setSubPost(RefreshDataUtils.castStrList2String(userInfo.getSubPost()));
                 esUserInfo.setEquipType(RefreshDataUtils.castStrList2String(userInfo.getEquipType()));
+                esUserInfo.setEquipTypeName(RefreshDataUtils.castEquCategory2Name(esUserInfo.getEquipType()));
                 esUserInfo.setUnitType(unit.getUnitType());
                 esUserInfo.setSuperviseOrgName(unit.getSuperviseOrgName());
                 esUserInfo.setSuperviseOrgCode(unit.getSuperviseOrgCode());