fix(jg)：历史平台登记功能修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -304,8 +304,7 @@ public class CommonController extends BaseController {
     @PostMapping(value = "/saveOrUpdateHistory")
     @ApiOperation(httpMethod = "POST", value = "历史平台登记业务发起公共接口", notes = "历史平台登记业务发起公共接口")
     public ResponseModel<Object> saveOrUpdateHistory(@RequestBody Map<String, Object> map) {
-        Object result = commonService.invokeBusinessType(map);
-        return ResponseHelper.buildResponse(result);
+        return ResponseHelper.buildResponse(commonService.invokeBusinessType(map));
     }
 
     /**

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

@@ -151,6 +151,8 @@ public class CommonServiceImpl implements ICommonService {
     private static final String ADMINISTRATION_UNIT = "行政审批局";
     // 业务通用发起——基本信息
     private static final String basic = "basic";
+    private static final String HISTORY_EQU_TYPE = "historyEquType";
+    private static final String SECOND  = "second";
     // 业务通用发起——告知单详情
     private static final String notice = "notice";
     // 业务通用发起——技术参数-改造变更登记使用
@@ -1232,22 +1234,20 @@ public class CommonServiceImpl implements ICommonService {
 
     @Override
     public Object invokeBusinessType(Map<String, Object> map) {
-        Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);
-        Map<String, Object> noticeObj = (Map<String, Object>) map.get(notice);
-
-        String type = (String) basicObj.get("type");
-        noticeObj.put("businessCode", type);
-        if (type.equals(ApplicationFormTypeEnum.SYDJ.getBusinessCode())) {
-            String businessScenarios = (String) basicObj.get("businessScenarios");
-            String code = (String) basicObj.get("code");
-            noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
-            JSONObject jsonObject = new JSONObject(noticeObj);
-            return "1".equals(businessScenarios) && CylinderTypeEnum.CYLINDER.getCode().equals(code) ?
-                    jgVehicleInformationService.saveOrUpdateHisData(jsonObject) : jgUseRegistrationServiceImpl.handleHistoryEquip(jsonObject);
+        String historyEquType = (String) map.get(HISTORY_EQU_TYPE); // Assuming HISTORY_EQU_TYPE is a String key
+        Map<String, Object> noticeObj = (Map<String, Object>) map.get(SECOND); // Assuming SECOND is a String key
+        JSONObject jsonObject = new JSONObject(noticeObj);
+        switch (historyEquType) {
+            case "unit":
+                return jgUseRegistrationServiceImpl.handleUnitHistoryEquip(jsonObject);
+            case "vehicle":
+                return jgVehicleInformationService.saveOrUpdateHisData(jsonObject);
+            default:
+                return jgUseRegistrationServiceImpl.handleHistoryEquip(jsonObject);
         }
-        return null;
     }
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object transfer(Map<String, Object> map) {

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

@@ -2455,7 +2455,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * @param jsonObject
      * @return
      */
-    private List<Map<String, Object>> handleUnitHistoryEquip(JSONObject jsonObject) {
+    public List<Map<String, Object>> handleUnitHistoryEquip(JSONObject jsonObject) {
         return null;
     }
 

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

@@ -1618,10 +1618,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     @GlobalTransactional(rollbackFor = Exception.class)
     public List<JgVehicleInformation> saveOrUpdateHisData(JSONObject map) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
-        JSONObject firstMap = map.getJSONObject("first");
-        JSONObject secondMap = map.getJSONObject("second");
-        JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(secondMap), JgVehicleInformationDto.class);
-        List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) secondMap.get("equipmentLists");
+        JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(map), JgVehicleInformationDto.class);
+        List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
         if (CollectionUtils.isEmpty(equipmentLists) ||
                 equipmentLists.stream().map(v -> (String) v.get("chargingMedium")).distinct().count() != 1) {
             throw new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同充装介质设备！");
@@ -1710,7 +1708,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         }
 
         // 安全管理员
-        Optional.ofNullable(secondMap.getString("safetyManagerId"))
+        Optional.ofNullable(map.getString("safetyManagerId"))
                 .filter(manager -> manager.contains("_"))
                 .map(manager -> manager.split("_"))
                 .ifPresent(data -> {
@@ -1720,14 +1718,14 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
         // 产权单位信息
         if (!StringUtils.isEmpty(vehicleInfoDto.getEstateUnitName())) {
-            String[] data = String.valueOf(secondMap.getString("estateUnitName")).split("_");
+            String[] data = String.valueOf(map.getString("estateUnitName")).split("_");
             vehicleInfoDto.setEstateUnitCreditCode(data[0]);
             vehicleInfoDto.setEstateUnitName(data[1]);
         }
 
         // 其他附件
-        if (!ObjectUtils.isEmpty(secondMap.get("otherAccessories"))) {
-            vehicleInfoDto.setOtherAccessories(JSONObject.toJSONString(secondMap.get("otherAccessories")));
+        if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
+            vehicleInfoDto.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
         }
 
         JgVehicleInformation vehicleInformation = new JgVehicleInformation();