refactor(大编辑)：代码重构

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/FieldDisplayDefine.java

 package com.yeejoin.amos.boot.biz.common.annotation;
 
+
 import java.lang.annotation.*;
 
 
@@ -22,4 +23,5 @@ public @interface FieldDisplayDefine {
 
     boolean isExist() default true;
 
+    String typeHandler() default "defaultTypeHandler";
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/DataDictionaryServiceImpl.java

@@ -94,8 +94,7 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
 
     public DataDictionary getByCode(String code,String type)  {
 
-        DataDictionary byCode = dataDictionaryMapper.getByCode(code,type);
-        return byCode;
+        return dataDictionaryMapper.getByCode(code,type);
 
     }
     

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/typeHandler/DefaultTypeHandler.java

+package com.yeejoin.amos.boot.biz.common.typeHandler;
+
+import org.springframework.stereotype.Component;
+
+@Component("defaultTypeHandler")
+public class DefaultTypeHandler implements TypeHandler<String> {
+    @Override
+    public String handle(String value) {
+        return value;
+    }
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/typeHandler/TypeHandler.java

+package com.yeejoin.amos.boot.biz.common.typeHandler;
+
+public interface TypeHandler<T> {
+    T handle(T value);
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/ESDataChangeLogDto.java

@@ -53,4 +53,10 @@ public class ESDataChangeLogDto {
 
     @Field(type = FieldType.Keyword)
     private String columnType;
+
+    @Field(type = FieldType.Text)
+    private String displayOldValue;
+
+    @Field(type = FieldType.Text)
+    private String displayNewValue;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipDesignChangeDataDto.java

@@ -46,6 +46,6 @@ public class EquipDesignChangeDataDto extends BaseChangeDataDto {
     @FieldDisplayDefine(value = "其他附件", type = JSON.class)
     private String otherAccessoriesDes;
 
-    @FieldDisplayDefine(value = "设计资料是否完整齐全")
+    @FieldDisplayDefine(value = "设计资料是否完整齐全" , typeHandler = "isCompleteTypeHandler")
     private String designIsComplete;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipFactoryChangeDataDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
 import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import lombok.Data;
@@ -51,6 +50,6 @@ public class EquipFactoryChangeDataDto extends BaseChangeDataDto {
     @FieldDisplayDefine(value = "锅炉能效证明文件", type = JSON.class)
     private String boilerEnergyEfficiencyCertificate;
 
-    @FieldDisplayDefine(value = "制造资料是否完整齐全")
+    @FieldDisplayDefine(value = "制造资料是否完整齐全", typeHandler = "isCompleteTypeHandler")
     private String factoryIsComplete;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipRegisterChangeDataDto.java

@@ -43,6 +43,6 @@ public class EquipRegisterChangeDataDto extends BaseChangeDataDto {
     @FieldDisplayDefine(value = "其他附件", type = JSON.class)
     private String otherAccessoriesReg;
 
-    @FieldDisplayDefine(value = "安装资料是否完整齐全")
+    @FieldDisplayDefine(value = "安装资料是否完整齐全", typeHandler = "isCompleteTypeHandler")
     private String installationIsComplete;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/FieldChangeMeta.java

@@ -49,4 +49,15 @@ public class FieldChangeMeta implements Serializable {
      */
     private String columnType;
 
+
+    /**
+     * 显示的新值
+     */
+    private String displayNewValue;
+
+    /**
+     * 显示的旧值
+     */
+    private String displayOldValue;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -301,5 +301,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     List<Map<String, Object>> getUnitInfoListByType(String type);
 
     String queryUnitCreditCodeBySeq(String unitSeq);
+
+    String queryUnitNameByCreditCode(String unitCreditCode);
 }
 

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

@@ -2804,4 +2804,7 @@
             tz_base_enterprise_info
         where sequence_nbr = #{unitSeq}
     </select>
+    <select id="queryUnitNameByCreditCode" resultType="java.lang.String">
+        select use_unit from tz_base_enterprise_info where use_unit_code = #{unitCreditCode}
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/event/listener/ChangeLogInsertListener.java

@@ -141,6 +141,8 @@ public class ChangeLogInsertListener {
             changeLogDto.setChangeId(changeDataDto.getChangeId());
             changeLogDto.setColumnFamily(changeDataDto.getColumnFamily());
             changeLogDto.setBizType(changeDataDto.getBizType());
+            changeLogDto.setDisplayOldValue(changeDataDto.getDisplayOldValue());
+            changeLogDto.setDisplayNewValue(changeDataDto.getDisplayNewValue());
             changeLogDto.setBatchId(changeLog.getSequenceNbr() + "");
             changeLogDto.setColumnType(changeDataDto.getColumnType());
             return changeLogDto;

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

@@ -15,11 +15,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
 import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.typeHandler.TypeHandler;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
+import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.FormatService;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImpl;
@@ -57,6 +59,7 @@ import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -116,6 +119,8 @@ public class CommonEquipDataProcessService {
 
     private final CommonMapper commonMapper;
 
+    private final FormatService formatService;
+
     public static final String BASE_COLUMN_REC_DATE = "\"REC_DATE\"";
     public static final String BASE_COLUMN_REC_USERID = "\"REC_USER_ID\"";
 
@@ -695,6 +700,8 @@ public class CommonEquipDataProcessService {
                             fieldChangeMeta.setColumnOldValue(Boolean.toString((Boolean) oldVal));
                             fieldChangeMeta.setColumnNewValue(Boolean.toString((Boolean) newVal));
                         }
+                        fieldChangeMeta.setDisplayOldValue(formatService.format(displayDefine.typeHandler(), fieldChangeMeta.getColumnOldValue()));
+                        fieldChangeMeta.setDisplayNewValue(formatService.format(displayDefine.typeHandler(), fieldChangeMeta.getColumnNewValue()));
                         changeData.add(fieldChangeMeta);
                     }
                 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/DefaultDictTypeHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.typeHandler.TypeHandler;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 默认字典处理器
+ */
+public abstract class DefaultDictTypeHandler implements TypeHandler<String> {
+
+    private final DataDictionaryServiceImpl dataDictionaryService;
+
+    private final Map<String, String> cache = new ConcurrentHashMap<>();
+
+    protected DefaultDictTypeHandler(DataDictionaryServiceImpl dataDictionaryService) {
+        this.dataDictionaryService = dataDictionaryService;
+    }
+
+    public abstract String getDictType();
+
+    @Override
+    public String handle(String code) {
+        return cache.computeIfAbsent(code, (k) -> {
+            DataDictionary dataDictionary = dataDictionaryService.getByCode(code, getDictType());
+            return Optional.ofNullable(dataDictionary).map(DataDictionary::getName).orElse(null);
+        });
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/EquipCategoryTypeHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.typeHandler.TypeHandler;
+import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 特种设备目录处理器
+ */
+@Component("equipCategoryTypeHandler")
+@RequiredArgsConstructor
+public class EquipCategoryTypeHandler implements TypeHandler<String> {
+    private final Map<String, String> CODE_NAME_MAP = new ConcurrentHashMap<>();
+
+    private final EquipmentCategoryMapper equipmentCategoryMapper;
+
+    @Override
+    public String handle(String code) {
+        return CODE_NAME_MAP.computeIfAbsent(code, (k) -> {
+            EquipmentCategory equipmentCategory = equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, code).select(EquipmentCategory::getName, EquipmentCategory::getId));
+            return equipmentCategory == null ? "" : equipmentCategory.getName();
+        });
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/EstateUnitTypeHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.yeejoin.amos.boot.biz.common.typeHandler.TypeHandler;
+import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 产权单位处理器
+ */
+@Component("estateUnitTypeHandler")
+@RequiredArgsConstructor
+public class EstateUnitTypeHandler implements TypeHandler<String> {
+    private final Map<String, String> CODE_NAME_MAP = new ConcurrentHashMap<>();
+
+    private final CommonMapper commonMapper;
+
+    @Override
+    public String handle(String unitCreditCode) {
+        return CODE_NAME_MAP.computeIfAbsent(unitCreditCode, (k) -> commonMapper.queryUnitNameByCreditCode(unitCreditCode));
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/FormatService.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.yeejoin.amos.boot.biz.common.typeHandler.TypeHandler;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Service
+@RequiredArgsConstructor
+public class FormatService {
+
+
+    private final ApplicationContext context;
+
+    private final Map<String, TypeHandler<String>> handlerCache = new ConcurrentHashMap<>();
+
+    @Value("${type-handler.default:defaultTypeHandler}")
+    private String defaultHandlerName;
+
+    public String format(String typeHandler, String value) {
+        try {
+            TypeHandler<String> handler = handlerCache.computeIfAbsent(typeHandler,
+                    k -> context.getBean(k, TypeHandler.class)
+            );
+            return handler.handle(value);
+        } catch (NoSuchBeanDefinitionException e) {
+            TypeHandler<String> defaultHandler = context.getBean(defaultHandlerName, TypeHandler.class);
+            handlerCache.put(typeHandler, defaultHandler); // 缓存回退处理器的关联
+            return defaultHandler.handle(value);
+        }
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/HasOrNoTypeHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.yeejoin.amos.boot.biz.common.typeHandler.TypeHandler;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 有无(设备代码，96333识别码)处理器
+ */
+@Component("hasOrNoTypeHandler")
+public class HasOrNoTypeHandler implements TypeHandler<String> {
+    private static final Map<String, String> CODE_NAME_MAP = new HashMap<String, String>();
+
+    static {
+        CODE_NAME_MAP.put("1", "有");
+        CODE_NAME_MAP.put("2", "无");
+    }
+
+    @Override
+    public String handle(String value) {
+        return CODE_NAME_MAP.get(value);
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/InspectConclusionTypeHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * 检验结论处理器
+ */
+@Component("inspectConclusionTypeHandler")
+public class InspectConclusionTypeHandler extends DefaultDictTypeHandler {
+
+    protected InspectConclusionTypeHandler(DataDictionaryServiceImpl dataDictionaryService) {
+        super(dataDictionaryService);
+    }
+
+    @Override
+    public String getDictType() {
+        return "JYJL";
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/InspectTypeTypeHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.typeHandler.TypeHandler;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 检验类型处理器
+ */
+@Component("inspectTypeTypeHandler")
+public class InspectTypeTypeHandler extends DefaultDictTypeHandler {
+
+
+    protected InspectTypeTypeHandler(DataDictionaryServiceImpl dataDictionaryService) {
+        super(dataDictionaryService);
+    }
+
+    @Override
+    public String getDictType() {
+        return "JYJC";
+    }
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/IsCompleteTypeHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.yeejoin.amos.boot.biz.common.typeHandler.TypeHandler;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 资料是否齐全处理器
+ */
+@Component("isCompleteTypeHandler")
+public class IsCompleteTypeHandler implements TypeHandler<String> {
+
+    private static final Map<String, String> IS_COMPLETE_MAP = new HashMap<>();
+
+    static {
+        IS_COMPLETE_MAP.put("1", "齐全");
+        IS_COMPLETE_MAP.put("2", "不齐全");
+    }
+
+    @Override
+    public String handle(String value) {
+        return IS_COMPLETE_MAP.get(value);
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/RegionCodeTypeHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.yeejoin.amos.boot.biz.common.typeHandler.TypeHandler;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Stream;
+
+/**
+ * 行政区划处理器
+ */
+@Component("regionCodeTypeHandler")
+@RequiredArgsConstructor
+public class RegionCodeTypeHandler implements TypeHandler<String> {
+
+    private final RedisUtils redisUtils;
+    private final Map<String, String> CODE_NAME_MAP = new ConcurrentHashMap<>();
+
+    @Override
+    public String handle(String regionCode) {
+        return CODE_NAME_MAP.computeIfAbsent(regionCode, (k) -> {
+            List<LinkedHashMap> list1 = (List<LinkedHashMap>) redisUtils.get(CommonServiceImpl.PROVINCE);
+            List<LinkedHashMap> list2 = (List<LinkedHashMap>) redisUtils.get(CommonServiceImpl.CITY);
+            List<LinkedHashMap> list3 = (List<LinkedHashMap>) redisUtils.get(CommonServiceImpl.REGION);
+            List<LinkedHashMap> list4 = (List<LinkedHashMap>) redisUtils.get(CommonServiceImpl.STREET);
+            Optional<LinkedHashMap> op = Stream.of(list1, list2, list3, list4).flatMap(Collection::stream).filter(item -> String.valueOf(item.get("regionCode")).trim().equals(regionCode)).findFirst();
+            return op.map(linkedHashMap -> linkedHashMap.get("regionName").toString()).orElse(null);
+        });
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/UsePlaceTypeHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * 使用场所处理器
+ */
+@Component("usePlaceTypeHandler")
+public class UsePlaceTypeHandler extends DefaultDictTypeHandler {
+
+
+    protected UsePlaceTypeHandler(DataDictionaryServiceImpl dataDictionaryService) {
+        super(dataDictionaryService);
+    }
+
+    @Override
+    public String getDictType() {
+        return "ADDRESS";
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/typeHandler/YesOrNoTypeHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler;
+
+import com.yeejoin.amos.boot.biz.common.typeHandler.TypeHandler;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 是否处理器
+ */
+@Component("yesOrNoTypeHandler")
+public class YesOrNoTypeHandler implements TypeHandler<String> {
+    private static final Map<String, String> YES_OR_NO_TYPE = new HashMap<>();
+
+    static {
+        YES_OR_NO_TYPE.put("1", "是");
+        YES_OR_NO_TYPE.put("0", "否");
+    }
+
+    @Override
+    public String handle(String value) {
+        return YES_OR_NO_TYPE.get(value);
+    }
+}

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

@@ -131,10 +131,10 @@ public class CommonServiceImpl implements ICommonService {
     public static final String YWCJ = "YWCJ";
     public static final String DICT_DATA_KEY = "dictDataKey";
     // 行政区划redis缓存key
-    private static final String PROVINCE = "PROVINCE";
-    private static final String CITY = "CITY";
-    private static final String REGION = "REGION";
-    private static final String STREET = "STREET";
+    public static final String PROVINCE = "PROVINCE";
+    public static final String CITY = "CITY";
+    public static final String REGION = "REGION";
+    public static final String STREET = "STREET";
     // 行政区划level
     private static final String PROVINCE_LEVEL = "1";
     private static final String CITY_LEVEL = "2";

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

@@ -135,19 +135,19 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity implements IBaseChan
     @TableField(value = "\"CONSTRUCTION_OTHER_ACCESSORIES\"")
     private String constructionOtherAccessories;
 
-    @FieldDisplayDefine(value = "施工区域-省")
+    @FieldDisplayDefine(value = "施工区域-省", typeHandler = "regionCodeTypeHandler")
     @TableField(value = "\"CONSTRUCTION_PROVINCE\"")
     private String constructionProvince;
 
-    @FieldDisplayDefine(value = "施工区域-市")
+    @FieldDisplayDefine(value = "施工区域-市", typeHandler = "regionCodeTypeHandler")
     @TableField(value = "\"CONSTRUCTION_CITY\"")
     private String constructionCity;
 
-    @FieldDisplayDefine(value = "施工区域-区/县")
+    @FieldDisplayDefine(value = "施工区域-区/县", typeHandler = "regionCodeTypeHandler")
     @TableField(value = "\"CONSTRUCTION_COUNTY\"")
     private String constructionCounty;
 
-    @FieldDisplayDefine(value = "施工区域-街道")
+    @FieldDisplayDefine(value = "施工区域-街道", typeHandler = "regionCodeTypeHandler")
     @TableField(value = "\"CONSTRUCTION_STREET\"")
     private String constructionStreet;
 

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

@@ -126,7 +126,7 @@ public class IdxBizJgDesignInfo extends TzsBaseEntity implements IBaseChangeData
      * 资料是否完整齐全：1-齐全；2-不齐全【历史无证设备需要】
      */
     @TableField("\"DESIGN_IS_COMPLETE\"")
-    @FieldDisplayDefine(value = "设计资料是否完整齐全")
+    @FieldDisplayDefine(value = "设计资料是否完整齐全", typeHandler = "isCompleteTypeHandler")
     private String designIsComplete;
 
     /**

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

 package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
 import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
@@ -16,7 +11,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -91,7 +85,7 @@ public class IdxBizJgFactoryInfo extends TzsBaseEntity implements IBaseChangeDat
      *
      */
 	@TableField("\"IMPORTED\"")
-    @FieldDisplayDefine(value = "是否进口")
+    @FieldDisplayDefine(value = "是否进口", typeHandler = "yesOrNoTypeHandler")
     private String imported;
 
     /**
@@ -164,7 +158,7 @@ public class IdxBizJgFactoryInfo extends TzsBaseEntity implements IBaseChangeDat
      * 资料是否完整齐全：1-齐全；2-不齐全【历史无证设备需要】
      */
     @TableField("\"FACTORY_IS_COMPLETE\"")
-    @FieldDisplayDefine(value = "制造资料是否完整齐全")
+    @FieldDisplayDefine(value = "制造资料是否完整齐全", typeHandler = "isCompleteTypeHandler")
     private String factoryIsComplete;
 
 }

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
 import com.yeejoin.amos.boot.biz.common.annotation.Group;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
 import lombok.Data;
@@ -50,7 +49,7 @@ public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity implements IB
      *
      */
     @TableField("\"INSPECT_TYPE\"")
-    @FieldDisplayDefine(value ="检验类型")
+    @FieldDisplayDefine(value ="检验类型", typeHandler = "inspectTypeTypeHandler")
     private String inspectType;
 
     /**
@@ -91,7 +90,7 @@ public class IdxBizJgInspectionDetectionInfo extends TzsBaseEntity implements IB
      *
      */
     @TableField("\"INSPECT_CONCLUSION\"")
-    @FieldDisplayDefine(value ="检验结论")
+    @FieldDisplayDefine(value ="检验结论", typeHandler = "inspectConclusionTypeHandler")
     private String inspectConclusion;
 
     /**

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

@@ -139,6 +139,6 @@ public class IdxBizJgOtherInfo extends TzsBaseEntity implements IBaseChangeData
      * 96333码类型，类型手工输入（1）、系统自动生成（2）（历史登记时使用）,默认2
      */
     @TableField("\"CODE96333_TYPE\"")
-    @FieldDisplayDefine(value = "有无96333识别码")
+    @FieldDisplayDefine(value = "有无96333识别码", typeHandler = "hasOrNoTypeHandler")
     private String code96333Type;
 }

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

@@ -76,7 +76,7 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity implements IBaseChangeDa
      * 设备代码类型手工输入（1）、系统自动生成（2）
      */
     @TableField("\"EQU_CODE_TYPE\"")
-    @FieldDisplayDefine(value = "设备代码类型")
+    @FieldDisplayDefine(value = "设备代码类型", typeHandler = "hasOrNoTypeHandler")
     private String equCodeType;
 
 
@@ -103,7 +103,7 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity implements IBaseChangeDa
      *
      */
     @TableField("\"EQU_DEFINE\"")
-    @FieldDisplayDefine(value = "设备品种")
+    @FieldDisplayDefine(value = "设备品种", typeHandler = "quipCategoryTypeHandler")
     private String equDefine;
 
     /**
@@ -237,7 +237,7 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity implements IBaseChangeDa
      * 安装资料是否完整齐全：1-齐全；2-不齐全【历史无证设备需要】
      */
     @TableField("\"INSTALLATION_IS_COMPLETE\"")
-    @FieldDisplayDefine(value = "安装资料是否完整齐全")
+    @FieldDisplayDefine(value = "安装资料是否完整齐全", typeHandler = "isCompleteTypeHandler")
     private String installationIsComplete;
 
     /**

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

@@ -63,7 +63,7 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
      *
      */
     @TableField("\"ESTATE_UNIT_CREDIT_CODE\"")
-    @FieldDisplayDefine(value = "产权单位统一信用代码")
+    @FieldDisplayDefine(value = "产权单位统一信用代码", typeHandler = "estateUnitTypeHandler")
     private String estateUnitCreditCode;
 
     /**
@@ -109,28 +109,28 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
      *
      */
     @TableField("\"PROVINCE\"")
-    @FieldDisplayDefine(value = "省份行政区划")
+    @FieldDisplayDefine(value = "省份行政区划", typeHandler = "regionCodeTypeHandler")
     private String province;
 
     /**
      *
      */
     @TableField("\"CITY\"")
-    @FieldDisplayDefine(value = "地市行政区划")
+    @FieldDisplayDefine(value = "地市行政区划", typeHandler = "regionCodeTypeHandler")
     private String city;
 
     /**
      *
      */
     @TableField("\"COUNTY\"")
-    @FieldDisplayDefine(value = "区县行政区划")
+    @FieldDisplayDefine(value = "区县行政区划", typeHandler = "regionCodeTypeHandler")
     private String county;
 
     /**
      *
      */
     @TableField("\"FACTORY_USE_SITE_STREET\"")
-    @FieldDisplayDefine(value = "街道行政区划")
+    @FieldDisplayDefine(value = "街道行政区划", typeHandler = "regionCodeTypeHandler")
     private String factoryUseSiteStreet;
 
     /**
@@ -151,7 +151,7 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
      *
      */
     @TableField("\"USE_PLACE\"")
-    @FieldDisplayDefine(value = "使用场所")
+    @FieldDisplayDefine(value = "使用场所", typeHandler = "usePlaceTypeHandler")
     private String usePlace;
 
     /**
@@ -189,18 +189,21 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
     /**
      *
      */
+    @FieldDisplayDefine(value = "省份行政区划名称")
     @TableField("\"PROVINCE_NAME\"")
     private String provinceName;
 
     /**
      *
      */
+    @FieldDisplayDefine(value = "地市行政名称")
     @TableField("\"CITY_NAME\"")
     private String cityName;
 
     /**
      *
      */
+    @FieldDisplayDefine(value = "区县行政区划名称")
     @TableField("\"COUNTY_NAME\"")
     private String countyName;
 
@@ -240,11 +243,12 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
      * 是否西咸
      */
     @TableField("\"IS_NOT_XIXIAN\"")
-    @FieldDisplayDefine(value = "是否西咸")
+    @FieldDisplayDefine(value = "是否西咸", typeHandler = "yesOrNoTypeHandler")
     private String isNotXiXian;
 
 
     @TableField("\"STREET_NAME\"")
+    @FieldDisplayDefine(value = "街道行政区划名称")
     private String streetName;
 
     /**