feat(jg): 设备管理

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ESEquipmentCategoryDto.java

@@ -202,4 +202,10 @@ public class ESEquipmentCategoryDto {
      */
     @Field(type = FieldType.Long)
     private Long CREATE_DATE;
+
+    /**
+     * 标签
+     */
+    @Field(type = FieldType.Keyword)
+    private String tag1;
 }

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

@@ -45,4 +45,7 @@ public class EquipRegisterChangeDataDto extends BaseChangeDataDto {
 
     @FieldDisplayDefine(value = "安装资料是否完整齐全", typeHandler = "isCompleteTypeHandler")
     private String installationIsComplete;
+
+    @FieldDisplayDefine(value = "设备标签", typeHandler = "tagTypeHandler")
+    private String tag1;
 }

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

@@ -773,7 +773,8 @@
              jfi.FACT_SUPERVISION_INSPECTION_REPORT                                 as factSupervisionInspectionReport,
              jfi.BOILER_ENERGY_EFFICIENCY_CERTIFICATE                               as boilerEnergyEfficiencyCertificate,
              jfi.FACTORY_IS_COMPLETE                                                as factoryIsComplete,
-             jri.WHETHER_SKID_MOUNTED_PRESSURE_VESSEL                               as whetherSkidMountedPressureVessel
+             jri.WHETHER_SKID_MOUNTED_PRESSURE_VESSEL                               as whetherSkidMountedPressureVessel,
+             jri.tag1
       from idx_biz_jg_register_info jri
       LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
       where jri.RECORD = #{id}

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

@@ -63,6 +63,7 @@ public class EquipChangeDataUpdateServiceImpl {
         updateWrapper.set(IdxBizJgRegisterInfo::getProductPhoto, registerChangeDataDto.getProductPhoto());
         updateWrapper.set(IdxBizJgRegisterInfo::getOtherAccessoriesReg, registerChangeDataDto.getOtherAccessoriesReg());
         updateWrapper.set(IdxBizJgRegisterInfo::getInstallationIsComplete, registerChangeDataDto.getInstallationIsComplete());
+        updateWrapper.set(IdxBizJgRegisterInfo::getTag1, registerChangeDataDto.getTag1());
         idxBizJgRegisterInfoMapper.update(null, updateWrapper);
         updateRegisterEsData(record, registerChangeDataDto);
     }
@@ -143,6 +144,7 @@ public class EquipChangeDataUpdateServiceImpl {
             esEquipmentCategoryDto.setEQU_TYPE(registerChangeDataDto.getEquType());
             esEquipmentCategoryDto.setEQU_CATEGORY_CODE(registerChangeDataDto.getEquCategory());
             esEquipmentCategoryDto.setEQU_DEFINE_CODE(registerChangeDataDto.getEquDefine());
+            esEquipmentCategoryDto.setTag1(registerChangeDataDto.getTag1());
             // 冗余设备类别名称
             if (StringUtils.isEmpty(registerChangeDataDto.getEquCategory())) {
                 esEquipmentCategoryDto.setEQU_CATEGORY(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/TagTypeHandler.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("tagTypeHandler")
+public class TagTypeHandler implements TypeHandler<String> {
+    private static final Map<String, String> CODE_NAME_MAP = new HashMap<String, String>();
+
+    static {
+        CODE_NAME_MAP.put("1", "A类");
+        CODE_NAME_MAP.put("2", "B类");
+    }
+
+    @Override
+    public String handle(String value) {
+        return CODE_NAME_MAP.get(value);
+    }
+}

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

@@ -257,4 +257,11 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity implements IBaseChangeDa
      */
     @TableField("\"IS_COMPLETE_XA\"")
     private String isCompleteXa;
+
+    /**
+     * 通用标签
+     */
+    @TableField("\"TAG1\"")
+    @FieldDisplayDefine(value = "设备标签", typeHandler = "tagTypeHandler")
+    private String tag1;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -110,7 +110,8 @@
                WHETHER_VEHICLE_CYLINDER,
                WHETHER_SKID_MOUNTED_PRESSURE_VESSEL,
                DATE_FORMAT(PRODUCE_DATE, '%Y-%m-%d %H:%i:%s') as PRODUCE_DATE,
-               PROJECT_CONTRAPTION
+               PROJECT_CONTRAPTION,
+               TAG1
         from idx_biz_view_jg_all
         WHERE SEQUENCE_NBR = #{id}
     </select>