1.1.历史无证设备设备来源进行分3类

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

@@ -10,7 +10,7 @@ import java.util.Map;
 @AllArgsConstructor
 public enum EquipSourceEnum {
     jg_his("历史设备", "jg_his"),
-
+    jg_his_black("历史设备(无登记证)", "jg_his_black"),
     jg("新设备", "jg");
 
     private final String 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

@@ -1015,6 +1015,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 objMap.putAll(filterMap);
             }
         }
+        objMap.put(DATA_SOURCE_NAME, this.getDataSourceName(useInfo.getDataSource()));
         // 设计制造
         IdxBizJgDesignInfo designInfo = iIdxBizJgDesignInfoService.getOneData(record);
         if (!ValidationUtil.isEmpty(designInfo)) {
@@ -1940,11 +1941,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 if (!ValidationUtil.isEmpty(dto2.get(DATA_SOURCE))) {
                     String s = dto2.get(DATA_SOURCE).toString();
                     dto2.put(DATA_SOURCE, s);
-                    dto2.put(DATA_SOURCE_NAME, Arrays.stream(EquipSourceEnum.values())
-                            .filter(e -> s.startsWith(e.getCode()))
-                            .map(EquipSourceEnum::getName)
-                            .findFirst()
-                            .orElse(EquipSourceEnum.jg.getName()));
+                    dto2.put(DATA_SOURCE_NAME, this.getDataSourceName(s));
                 }
                 dto2.put("record", dto2.get(SEQUENCE_NBR));
                 list.add(dto2);
@@ -1999,6 +1996,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         return result;
     }
 
+    private String getDataSourceName(String dataSource) {
+        if(StringUtils.isEmpty(dataSource)){
+            return "";
+        }
+        if(EquipSourceEnum.jg.getCode().equals(dataSource) || (dataSource.startsWith(EquipSourceEnum.jg.getCode()) || !dataSource.startsWith(EquipSourceEnum.jg_his.getCode()))){
+            return EquipSourceEnum.jg.getName();
+        } else if(dataSource.startsWith(EquipSourceEnum.jg_his_black.getCode())){
+            return EquipSourceEnum.jg_his_black.getName();
+        } else {
+            return EquipSourceEnum.jg_his.getName();
+        }
+    }
+
     /**
      * 设备注册信息分页查询
      *
@@ -2420,7 +2430,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if (equipmentInfoForm.containsKey("DATA_SOURCE")) {
                 String dataSourceCopy = equipmentInfoForm.get("DATA_SOURCE").toString();
                 if (dataSourceCopy.startsWith("jg_his_black")) {
-                    dataSource = "jg_his_black" + sourceRecord;
+                    dataSource = "jg_his_black_" + sourceRecord;
                 } else if (dataSourceCopy.startsWith("jg_his")) {
                     dataSource = "jg_his_" + sourceRecord;
                 } else {