修改：使用登记生成设备注册代码（如果没有则生成）

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+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.module.jg.api.dto.JgUseRegistrationDto;
@@ -47,6 +48,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
 import java.time.LocalDate;
 import java.util.*;
 
@@ -726,15 +728,32 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
         lambdaOth.eq(IdxBizJgOtherInfo::getRecord, record);
         IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(lambdaOth);
+        // 使用信息
+        LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
+        lambda.eq(IdxBizJgUseInfo::getRecord, record);
+        IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
+        // 注册信息
+        LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
+        lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, record);
+        IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
+        if (ObjectUtils.isEmpty(registerInfo.getEquCode())) {
+            //生成设备注册代码
+            StringBuffer stringBuffer = new StringBuffer();
+            String ym = null;
+            try {
+                ym = DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM);
+            } catch (ParseException e) {
+                log.error("日期转换失败：{}", e);
+            }
+            stringBuffer.append(registerInfo.getEquCategory()).append(useInfo.getCity()).append(ym);
+            ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(stringBuffer.toString());
+            String deviceRegistrationCode = responseModel.getResult();
+            if (!ObjectUtils.isEmpty(deviceRegistrationCode)) {
+                registerInfo.setEquCode(deviceRegistrationCode);
+                idxBizJgRegisterInfoMapper.updateById(registerInfo);
+            }
+        }
         if (ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
-            // 使用信息
-            LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
-            lambda.eq(IdxBizJgUseInfo::getRecord, record);
-            IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
-            // 注册信息
-            LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
-            lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, record);
-            IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
             // 生成监管码、96333码
             Map<String, Object> map = new HashMap<>();
             map.put("cityCode", useInfo.getCity());