fix(jg):设备暂存功能修改

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

@@ -54,4 +54,17 @@ public enum EquipSourceEnum {
             return EquipSourceEnum.jg_his.getName();
         }
     }
+
+    public static String getDataSourceType(String dataSource) {
+        if(StringUtils.isEmpty(dataSource)){
+            return EquipSourceEnum.jg_his.getType();
+        }
+        if(EquipSourceEnum.jg.getCode().equals(dataSource) || (dataSource.startsWith(EquipSourceEnum.jg.getCode()) && !dataSource.startsWith(EquipSourceEnum.jg_his.getCode()))){
+            return EquipSourceEnum.jg.getType();
+        } else if(dataSource.startsWith(EquipSourceEnum.jg_his_black.getCode())){
+            return EquipSourceEnum.jg_his_black.getType();
+        } else {
+            return EquipSourceEnum.jg_his.getType();
+        }
+    }
 }

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

@@ -1397,6 +1397,7 @@ public class CommonServiceImpl implements ICommonService {
         Map<String, Object> useRegFormUploadObj = (Map<String, Object>) map.get(useRegFormUpload);
         String uploadMode = String.valueOf(useRegFormUploadObj.get("uploadMode"));
         jsonObject.put("historySubmitType", historySubmitType);
+        jsonObject.put("historyEquType", historyEquType);
 
         Map<String, Function<JSONObject, Object>> handlerMap = new HashMap<>();
         handlerMap.put("unit", jgUseRegistrationServiceImpl::handleUnitHistoryEquip);

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

@@ -1106,6 +1106,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 设备注册信息
         Map<String, Object> equipInfoMap = this.getEquipInfoMap(record, "");
         if (!ValidationUtil.isEmpty(equIpClassMap)) {
+            equIpClassMap.put(DATA_SOURCE,equipInfoMap.get(DATA_SOURCE));
             resultMap.put(EQUIP_CLASS_FORM_ID, equIpClassMap);
         }
         equipInfoMap.put("companyLevel", companyLevel);
@@ -1469,6 +1470,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
         }
         objMap.put(DATA_SOURCE_NAME, EquipSourceEnum.getDataSourceName(useInfo.getDataSource()));
+        objMap.put(DATA_SOURCE, EquipSourceEnum.getDataSourceType(useInfo.getDataSource()));
         // 设计制造
         IdxBizJgDesignInfo designInfo = iIdxBizJgDesignInfoService.getOneData(record);
         if (!ValidationUtil.isEmpty(designInfo)) {

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

@@ -4298,7 +4298,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 }
 
                 // 历史设备 生成证书管理表记录 & 生成安装 维保等操作记录
-                if (registerInfo != null) {
+                if (registerInfo != null && !"temp".equals(map.get("historySubmitType"))) {
                     this.historyEquGenManageRelated(map, jgUseRegistration, registerInfo, idxBizJgFactoryInfo);
                 }
                 String routePath = this.buildTaskModel(jgUseRegistration, map, reginParams);