重新生成使用登记证编号问题处理

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

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
+import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService;
@@ -254,7 +255,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReform.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
 
             //交换历史数据与新增数据
-            updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString());
+            updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(),jgChangeRegistrationReform.getSupervisoryCode());
         } else {
             jgChangeRegistrationReform.setNextExecutorIds(role);
             jgChangeRegistrationReform.setPromoter(reginParams.getUserModel().getUserId());
@@ -359,10 +360,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      * @param equipId
      * @param currentDocumentId
      */
-    public void updateTechparamsByEquIdAndCurrentDoucumentId(String equipId, String currentDocumentId){
-        String useOrgCode = idxBizJgOtherInfoMapper.getSupervisoryCodeByEquipmentCode(equipId).split("-")[0];
-        ResponseModel<String> responseModel = tzsServiceFeignClient.useRegistrationCode(useOrgCode);
-        String newUseRegistrationCertificateNumber=responseModel.getResult();
+    public void updateTechparamsByEquIdAndCurrentDoucumentId(String equipId, String currentDocumentId,String supervisoryCode){
+        String newUseRegistrationCertificateNumber=getCode(supervisoryCode);
         IdxBizJgTechParamsElevator idxBizJgTechParamsElevator =idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD",equipId));
         JgRegistrationHistory jgRegistrationHistory=jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                 .eq("equ_id",equipId)
@@ -406,5 +405,19 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
         return  result;
     }
-
+    /**
+     * 参数为监管码
+     * @param supervisoryCode
+     * @return
+     */
+    public String getCode(String supervisoryCode) {
+        if (!ObjectUtils.isEmpty(supervisoryCode) && supervisoryCode.length() > 5) {
+            String name = EquipTypeEnum.getMessage(supervisoryCode.substring(1, 2));
+            String type = supervisoryCode.substring(2, 4);
+            String city = supervisoryCode.substring(0, 1);
+            ResponseModel<String> stringResponseModel = tzsServiceFeignClient.useRegistrationCode(name + type + "陕" + city);
+            return stringResponseModel.getResult();
+        }
+        return null;
+    }
 }
\ No newline at end of file