feat(jg): 优化设备注册码生成逻辑并统一字段命名

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipRequestParamsDto.java

@@ -29,8 +29,8 @@ public class EquipRequestParamsDto {
     private String orgBranchName;
     private String useOrgCode;
     private String vehicleApanage;
-    private String receiveOrgCode;
-    private String receiveOrgName;
+    private String receiveCompanyCode;
+    private String receiveCompanyName;
     private String projectContraptionSeq;
     private String projectContraption;
     private String projectContraptionNo;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -3548,6 +3548,7 @@
             privilege_company
         where
             company_code = #{receiveCompanyCode} and is_deleted = false
+        limit 1
     </select>
 
     <select id="querySupervisionCompanyCode" resultType="java.lang.String">

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

@@ -3157,6 +3157,8 @@ public class CommonServiceImpl implements ICommonService {
      * @return 使用登记证书唯一标识
      */
     public String generateCertificateNo(Map<String, String> equType, Date date, String receiveCompanyCode) {
+        // 使用接收机构代码换取区域代码
+        String regionCode = codeUtil.getCityRegionCode(receiveCompanyCode);
         String ym = "";
         try {
             ym = Optional.of(DateUtils.dateFormat(date, DateUtils.DATE_PATTERN_MM)).orElse(DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM));
@@ -3164,9 +3166,9 @@ public class CommonServiceImpl implements ICommonService {
             log.error("日期转换失败：", e);
         }
         ResponseModel<String> responseModel = null;
-        if (StringUtils.isNotBlank(receiveCompanyCode) && isValidCreditCode(receiveCompanyCode)) {
+        if (StringUtils.isNotBlank(regionCode)) {
             String equCode = Optional.ofNullable(equType.get("equDefineCode")).orElse(equType.get("equCategoryCode"));
-            String registrationCode = equCode + receiveCompanyCode + ym;
+            String registrationCode = equCode + regionCode + ym;
             responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
         }
         return Optional.ofNullable(responseModel).map(ResponseModel::getResult).orElse("");

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

@@ -2076,7 +2076,7 @@ public class DataDockServiceImpl {
         String equListCode = Objects.toString(equipInfo.get("EQU_LIST"), null);
         String equCategoryCode = Objects.toString(equipInfo.get("EQU_CATEGORY"), null);
         String equDefineCode = Objects.toString(equipInfo.get("EQU_DEFINE"), null);
-        String receiveOrgCode = Optional.ofNullable(equipInfo.get("RECEIVE_ORG_CODE")).map(String::valueOf).orElse(null);
+        String receiveCompanyCode = Optional.ofNullable(equipInfo.get("RECEIVE_ORG_CODE")).map(String::valueOf).orElse(null);
         String inspectUnitCreditCode = Optional.ofNullable(equLists.get(0).getInspectOrgCode()).orElse(null);
         String inspectUnitName = Optional.ofNullable(equLists.get(0).getInspectOrgName()).orElse(null);
         String useOrgCode = Optional.ofNullable(equipInfo.get("USE_ORG_CODE")).map(String::valueOf).orElse(null);
@@ -2114,12 +2114,12 @@ public class DataDockServiceImpl {
                 .setOrgBranchName(orgBranchCode.split("_").length > 1 ? orgBranchCode.split("_")[1] : "")
                 .setUseOrgCode(useOrgCode)
                 .setVehicleApanage(Objects.toString(equipInfo.get("VEHICLE_APANAGE"),""))
-                .setReceiveOrgCode(Optional.ofNullable(receiveOrgCode)
+                .setReceiveCompanyCode(Optional.ofNullable(receiveCompanyCode)
                         .map(code -> code.split("_"))
                         .filter(parts -> parts.length > 0)
                         .map(parts -> parts[0])
                         .orElse(null))
-                .setReceiveOrgName(Optional.ofNullable(receiveOrgCode)
+                .setReceiveCompanyName(Optional.ofNullable(receiveCompanyCode)
                         .map(code -> code.split("_"))
                         .filter(parts -> parts.length > 1)
                         .map(parts -> parts[1])
@@ -2135,7 +2135,7 @@ public class DataDockServiceImpl {
                 .setStartLatitudeLongitude(toJSONString(equipInfo.get("startLatitudeLongitude")))
                 .setEndLatitudeLongitude(toJSONString(equipInfo.get("endLatitudeLongitude")))
                 .setEquState(equState)
-                .setEquCode(installationNoticeService.generateEquCode(equListCode, equCategoryCode, equDefineCode, new Date(), receiveOrgCode));
+                .setEquCode(installationNoticeService.generateEquCode(equListCode, equCategoryCode, equDefineCode, new Date(), receiveCompanyCode));
     }
 
     /**
@@ -2397,13 +2397,13 @@ public class DataDockServiceImpl {
                 .setApplyNo(applyNo)
                 .setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName())
                 .setStatus(FlowStatusEnum.TO_BE_FINISHED.getName())
-                .setReceiveOrgName(paramsDto.getReceiveOrgName())
+                .setReceiveOrgName(paramsDto.getReceiveCompanyName())
                 .setInspectUnitCreditCode(paramsDto.getInspectUnitCreditCode())
                 .setInspectUnitName(paramsDto.getInspectUnitName())
                 .setAuditPassDate(new Date()).setRegType("1").setRegDate(new Date())
                 .setUseRegistrationCode(paramsDto.getUseOrgCode())
-                .setReceiveOrgCode(paramsDto.getReceiveOrgCode())
-                .setReceiveCompanyCode(paramsDto.getReceiveOrgCode())
+                .setReceiveOrgCode(paramsDto.getReceiveCompanyCode())
+                .setReceiveCompanyCode(paramsDto.getReceiveCompanyCode())
                 //.setReceiveCompanyOrgCode()
                 //.setReceiveOrgName(paramsDto.getReceiveOrgName())
                 .setUseAddress("")
@@ -2506,7 +2506,7 @@ public class DataDockServiceImpl {
     private JSONObject getJgUseRegistrationChangeData(EquipRequestParamsDto paramsDto, List<String> records, String spplyNo) {
         String record = Optional.ofNullable(records.get(0)).orElse("");
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("receiveOrgCode", paramsDto.getReceiveOrgCode() + "_" + paramsDto.getReceiveOrgName());
+        jsonObject.put("receiveOrgCode", paramsDto.getReceiveCompanyCode() + "_" + paramsDto.getReceiveCompanyName());
         jsonObject.put("status", FlowStatusEnum.TO_BE_FINISHED.getName());
         jsonObject.put("applyNo", spplyNo);
         jsonObject.remove("submit");
@@ -2560,11 +2560,11 @@ public class DataDockServiceImpl {
                 .useUnitName(paramsDto.getCompanyName())
                 .useUnitCreditCode(paramsDto.getCompanyCode())
                 .applyNo(useReg.getApplyNo())
-                .receiveCompanyCode(paramsDto.getReceiveOrgCode())
-                .receiveOrgName(paramsDto.getReceiveOrgName())
+                .receiveCompanyCode(paramsDto.getReceiveCompanyCode())
+                .receiveOrgName(paramsDto.getReceiveCompanyName())
                 .auditPassDate(new Date())
                 .useRegistrationCode(paramsDto.getUseOrgCode())
-                .certificateNo(commonService.generateCertificateNo(equType, new Date(), paramsDto.getReceiveOrgCode()))
+                .certificateNo(commonService.generateCertificateNo(equType, new Date(), paramsDto.getReceiveCompanyCode()))
                 .regType("1".equals(useReg.getRegType())? BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName():BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
                 .certificateStatus("已登记")
                 .regDate(new Date())

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

@@ -5081,7 +5081,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             log.error("日期转换失败：", e);
         }
         String equCode = Optional.ofNullable(dto.getEquDefineCode()).orElse(dto.getEquCategoryCode());
-        String registrationCode = equCode + receiveCompanyCode + ym;
+        String registrationCode = equCode + codeUtil.getCityRegionCode(receiveCompanyCode) + ym;
         ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
         return responseModel.getResult();
     }

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

@@ -1393,7 +1393,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                             IdxBizJgRegisterInfo idxBizJgRegisterInfo = getIdxBizJgRegisterInfo(jgRelationEquip);
                             String equCode = Optional.ofNullable(idxBizJgRegisterInfo.getEquDefine())
                                     .orElse(idxBizJgRegisterInfo.getEquCategory());
-                            String registrationCode = equCode + jgInstallationNotice.getReceiveOrgCreditCode() + finalYm;
+                            String registrationCode = equCode + codeUtil.getCityRegionCode(jgInstallationNotice.getReceiveOrgCreditCode()) + finalYm;
                             ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                             String deviceRegistrationCode = responseModel.getResult();
                             Map<String, Object> map = new HashMap<>();
@@ -2213,7 +2213,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         // 生成告知单编号
         String noticeCode = Optional.ofNullable(projectContraption.getEquDefine())
                 .orElse(projectContraption.getEquCategory());
-        String registrationCode = noticeCode + jgInstallationNotice.getReceiveOrgCreditCode() + finalYm;
+        String registrationCode = noticeCode + codeUtil.getCityRegionCode(jgInstallationNotice.getReceiveOrgCreditCode()) + finalYm;
         ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
         String deviceRegistrationCode = responseModel.getResult();
 
@@ -2432,7 +2432,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                         IdxBizJgRegisterInfo idxBizJgRegisterInfo = getIdxBizJgRegisterInfo(jgRelationEquip);
                         String equCode = Optional.ofNullable(idxBizJgRegisterInfo.getEquDefine())
                                 .orElse(idxBizJgRegisterInfo.getEquCategory());
-                        String registrationCode = equCode + jgInstallationNotice.getReceiveOrgCreditCode() + finalYm;
+                        String registrationCode = equCode + codeUtil.getCityRegionCode(jgInstallationNotice.getReceiveOrgCreditCode()) + finalYm;
                         ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                         String deviceRegistrationCode = responseModel.getResult();
                         Map<String, Object> map = new HashMap<>();

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

@@ -5,9 +5,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
-import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -16,6 +15,7 @@ import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.common.api.enums.ConstructionTypeEnum;
@@ -38,6 +38,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
@@ -45,7 +46,9 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProjectContraptionMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -77,7 +80,8 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl.*;
+import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl.EQU_CATEGORY_CODE;
+import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl.EQU_LIST_CODE;
 
 /**
  * 服务实现类
@@ -159,6 +163,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     @Autowired
     private IdxBizJgProjectContraptionMapper idxBizJgProjectContraptionMapper;
 
+    @Autowired
+    private CodeUtil codeUtil;
+
     /**
      * 根据sequenceNbr查询
      *
@@ -1001,7 +1008,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                         RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
                         String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine())
                                 .orElse(tzsJgRegistrationInfo.getEquCategory());
-                        String registrationCode = equCode + jgMaintainNotice.getReceiveCompanyCode() + ym;
+                        String registrationCode = equCode + codeUtil.getCityRegionCode(jgMaintainNotice.getReceiveCompanyCode()) + ym;
                         ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                         jgMaintainNoticeEq.setInformNumber(responseModel.getResult());
                     }

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

@@ -41,6 +41,7 @@ import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.jg.api.common.PipLenCalUtils;
+import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
@@ -148,6 +149,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     @Lazy
     private JgInstallationNoticeServiceImpl jgInstallationNoticeService;
 
+    @Autowired
+    private CodeUtil codeUtil;
+
 
     @ResultFieldMapping({
             @ResultFieldMapping.ResultFieldMap(sourceField = "useUnitCreditCode", targetField = "useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
@@ -987,7 +991,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                         RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
 
                         String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine()).orElse(tzsJgRegistrationInfo.getEquCategory());
-                        String registrationCode = equCode + jgReformNotice.getReceiveCompanyCode() + ym;
+                        String registrationCode = equCode + codeUtil.getCityRegionCode(jgReformNotice.getReceiveCompanyCode()) + ym;
                         ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                         String deviceRegistrationCode = responseModel.getResult();
                         noticeEq.setInformNumber(deviceRegistrationCode);

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

@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ObjectCleanerUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
@@ -133,6 +134,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @Autowired
     private IIdxBizJgConstructionInfoService iIdxBizJgConstructionInfoService;
 
+    @Autowired
+    private CodeUtil codeUtil;
+
     /**
      * 根据sequenceNbr查询
      *
@@ -1063,7 +1067,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(
                     new LambdaQueryWrapper<RegistrationInfo>().eq(RegistrationInfo::getRecord, eq.getEquId()));
             String equCode = Optional.ofNullable(tzsJgRegistrationInfo.getEquDefine()).orElse(tzsJgRegistrationInfo.getEquCategory());
-            String registrationCode = equCode + jgTransferNotice.getReceiveCompanyCode() + ym;
+            String registrationCode = equCode + codeUtil.getCityRegionCode(jgTransferNotice.getReceiveCompanyCode()) + ym;
             ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
             String deviceRegistrationCode = responseModel.getResult();
             eq.setInformNumber(deviceRegistrationCode);

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

@@ -21,11 +21,15 @@ import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
-import com.yeejoin.amos.boot.module.jg.api.enums.*;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CertificateStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
@@ -72,6 +76,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -87,8 +92,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import static com.alibaba.fastjson.JSON.parseArray;
-import static com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl.isValidCreditCode;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImplService.toZipFile;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getReissueDate;
@@ -162,6 +167,9 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     @Autowired
     private JgCertificateChangeRecordMapper certificateChangeRecordMapper;
 
+    @Autowired
+    private CodeUtil codeUtil;
+
     private static final long SCROLL_TIMEOUT = 180000;
     private static final int SIZE = 1000;
 
@@ -1019,9 +1027,9 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 log.error("日期转换失败：", e);
             }
             ResponseModel<String> responseModel;
-            if (isValidCreditCode(jgUseRegistrationManage.getReceiveCompanyCode())) {
+            if (!ValidationUtil.isEmpty(jgUseRegistrationManage.getReceiveCompanyCode())) {
                 String equCode = Optional.ofNullable(jgUseRegistrationManage.getEquDefineCode()).orElse(jgUseRegistrationManage.getEquCategoryCode());
-                String registrationCode = equCode + jgUseRegistrationManage.getReceiveCompanyCode() + ym;
+                String registrationCode = equCode + codeUtil.getCityRegionCode(jgUseRegistrationManage.getReceiveCompanyCode()) + ym;
                 responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                 jgUseRegistrationManage.setCertificateNo(responseModel.getResult());
                 jgUseRegistrationManageMapper.updateById(jgUseRegistrationManage);

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

@@ -1627,7 +1627,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             log.error("日期转换失败：", e);
         }
         String equCode = Optional.ofNullable(registerInfo.getEquDefine()).orElse(registerInfo.getEquCategory());
-        String registrationCode = equCode + jgUseRegistration.getReceiveCompanyOrgCode() + ym;
+        String registrationCode = equCode + codeUtil.getCityRegionCode(jgUseRegistration.getReceiveCompanyOrgCode()) + ym;
         return tzsServiceFeignClient.deviceRegistrationCode(registrationCode).getResult();
     }