1.移转变更不再更新监管码

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

@@ -822,7 +822,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         this.getBaseMapper().updateById(jgChangeRegistrationTransfer);
     }
 
-    private Map<String, String> createSupervisoryCode(JgRegistrationHistory historyData) {
+    private Map<String, String> create96333Code(JgRegistrationHistory historyData, String record) {
         Map<String, Object> changeData = JSON.parseObject(historyData.getChangeData(), Map.class);
         List<JSONObject> registrationList = (List<JSONObject>) changeData.get("registrationList");
         String equCategoryCode = Optional.ofNullable(registrationList)
@@ -838,20 +838,21 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 .map(s -> s.split("_")[0])
                 .orElse("");
         String isXiXian = "0".equals(changeData.get("transferIsXixian")) ? "null" : "1";
-
+        // 移转不需要重新生成监管码，只需要新生成96333码，接口上送supervisoryCode则不再生成监管码
+        IdxBizJgOtherInfo otherInfo = otherInfoService.getOneData(record);
+        String supervisoryCode = otherInfo.getSupervisoryCode();
         ImmutableMap<String, Object> map = ImmutableMap.<String, Object>builder()
                 .put("cityCode", cityCode)
                 .put("countyCode", countyCode)
                 .put("equCategory", equCategoryCode)
                 .put("isXiXian", isXiXian)
+                .put("superviseCode", supervisoryCode)
                 .build();
 
         Map<String, Object> result = tzsServiceFeignClient.createCode(map).getResult();
 
         return ImmutableMap.<String, String>builder()
-                .put("superviseCode", Optional.ofNullable(result)
-                        .map(r -> (String) r.get("superviseCode"))
-                        .orElse(""))
+                .put("superviseCode", supervisoryCode)
                 .put("code96333", Optional.ofNullable(result)
                         .map(r -> (String) r.get("code96333"))
                         .orElse(""))
@@ -935,7 +936,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 String supervisoryCode = "", code96333 = "";
                 //区外移装
                 if ("1".equals(transfer.getTransferType())) {
-                    Map<String, String> supervisoryCodeMap = this.createSupervisoryCode(historyData);
+                    Map<String, String> supervisoryCodeMap = this.create96333Code(historyData, device.getEquId());
                     supervisoryCode = supervisoryCodeMap.get("superviseCode");
                     code96333 = supervisoryCodeMap.get("code96333");
                     useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode(), false));
@@ -957,7 +958,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                             .map(ReginStepEnum::getCode)
                             .anyMatch(code -> code.equals(county) || code.equals(deviceCity));
                     if (shouldUpdateCode) {
-                        Map<String, String> supervisoryCodeMap = this.createSupervisoryCode(historyData);
+                        Map<String, String> supervisoryCodeMap = this.create96333Code(historyData, device.getEquId());
                         supervisoryCode = supervisoryCodeMap.get("superviseCode");
                         code96333 = supervisoryCodeMap.get("code96333");
                         useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode(), false));

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -431,11 +431,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
      */
     @Override
     public Map<String, String> createSupervisorCode(Map<String, Object> map) {
-        String city, county, equipCategory, isNotXiXian, code96333;
+        String city, county, equipCategory, isNotXiXian, code96333, supervisionCode;
         // 获取对应行政区划
         city = String.valueOf(map.get("cityCode"));
         county = String.valueOf(map.get("countyCode"));
         code96333 = String.valueOf(map.get("code96333"));
+        supervisionCode = String.valueOf(map.get("supervisionCode"));
         // 获取对应设备分类
         equipCategory = String.valueOf(map.get("equCategory"));
         if ("null".equals(equipCategory) || "null".equals(city) || "null".equals(county)) {
@@ -443,8 +444,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         }
         isNotXiXian = Optional.ofNullable(map.get("isXiXian")).orElse("0").toString();
         // 生成码
-        EquipmentCategoryServiceImpl categoryService = (EquipmentCategoryServiceImpl) AopContext.currentProxy();
-        Map<String, String> codeMap = creatCode(isNotXiXian, city, county, equipCategory, code96333, "null");
+        Map<String, String> codeMap = creatCode(isNotXiXian, city, county, equipCategory, code96333, supervisionCode);
         if (ObjectUtils.isEmpty(codeMap)) {
             throw new BadRequest("该请求参数未生成监管码或96333码,请核对参数");
         }
@@ -708,6 +708,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 String supervisor = createSupervisorCode(isNotXiXian, city, county, equipCategory);
                 supervisorCode.append(supervisor);
             } else {
+                log.info("使用上送的监管码{}，不再生成监管码", supervisionCode);
                 supervisorCode = new StringBuilder(supervisionCode);
             }