设备列本添加设备来源字段

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/EquipSourceEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public enum EquipSourceEnum {
+    jg_his("历史设备", "jg_his"),
+
+    jg("新设备", "jg");
+
+    private final String name;
+
+    private final String code;
+
+
+    public static String getMessage(String code) {
+        for (EquipSourceEnum constants : values()) {
+            if (constants.getCode().equals(code)) {
+                return constants.getName();
+            }
+        }
+        return null;
+    }
+
+    public static Map<Integer,String> getName=new HashMap<>();
+    public static Map<String,Integer> getCode=new HashMap<>();
+
+    static {
+        for (ConstructionEnum e : ConstructionEnum.values()){
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

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

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.EquipInfoCylinderExcelDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
+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.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.config.PressureVesselListener;
@@ -128,7 +129,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     /**
      * 设备来源 new：新设备录入  his：历史数据录入
      */
-    public static final String EQUIP_SOURCE = "EQUIP_SOURCE";
+    public static final String DATA_SOURCE = "DATA_SOURCE";
     /**
      * 业务类型 0：单个新增 1:批量导入
      */
@@ -1488,6 +1489,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     String status = EquimentEnum.getName.get(integer);
                     dto2.put(EQUSTATE, status);
                 }
+                if (!ValidationUtil.isEmpty(dto2.get(DATA_SOURCE))) {
+                    String s = dto2.get(DATA_SOURCE).toString();
+                    String equipSource = s.startsWith(EquipSourceEnum.jg.getCode()) ? EquipSourceEnum.jg.getName() : EquipSourceEnum.jg_his.getName();
+                    dto2.put(DATA_SOURCE, equipSource);
+                }
                 dto2.put("record", dto2.get(SEQUENCE_NBR));
                 list.add(dto2);
             }
@@ -1609,7 +1615,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 业务场景
         String businessScenarios = String.valueOf(equipmentClassForm.get(BUSINESS_SCENARIOS));
         // 数据来源 历史数据his 新数据new
-        String equipSource = String.valueOf(equipmentClassForm.get(EQUIP_SOURCE));
+        String equipSource = String.valueOf(equipmentClassForm.get(DATA_SOURCE));
 
         // 操作类型
         String operateType = ValidationUtil.isEmpty(equipmentInfoForm.get(SEQUENCE_NBR)) ? OPERATESAVE : OPERATEEDIT;