fix：使用登记后没有生成监管码

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,7 +7,6 @@ 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,8 +46,8 @@ 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.text.ParseException;
 import java.time.LocalDate;
 import java.util.*;
 
@@ -105,7 +104,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return this.baseMapper.getEquipListPage(page, factoryNum, equList, equCategory);
     }
 
-    public void updateEquipMessage(String currentDocumentId, String useOrgCode) {
+    public void updateEquipMessage(String currentDocumentId, JgUseRegistration jgUseRegistration) {
+        String useOrgCode = jgUseRegistration.getUseRegistrationCode();
         // 市
         List<LinkedHashMap> city = (List<LinkedHashMap>) redisUtils.get("CITY");
         // 区
@@ -186,7 +186,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 更新设备使用登记证
         idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), useOrgCode);
         // 更新es
-        createCode(String.valueOf(map.get("equipId")), map, useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + useInfo.getStreetName());
+        createCode(String.valueOf(map.get("equipId")), map, useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + useInfo.getStreetName(), jgUseRegistration);
     }
 
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
@@ -450,7 +450,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgUseRegistration.setAuditPassDate(new Date());
             }
             // 更新设备信息
-            updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration.getUseRegistrationCode());
+            updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration);
             // 更新代办状态
             HashMap<String, Object> params = new HashMap<>();
             params.put("relationId", jgUseRegistration.getInstanceId());
@@ -774,7 +774,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      *
      * @param record
      */
-    public void createCode(String record, JSONObject dataMap, String usePlace) {
+    public void createCode(String record, JSONObject dataMap, String usePlace, JgUseRegistration jgUseRegistration) {
         // 其他信息
         LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
         lambdaOth.eq(IdxBizJgOtherInfo::getRecord, record);
@@ -787,23 +787,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         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())) {
             // 生成监管码、96333码
             Map<String, Object> map = new HashMap<>();
@@ -818,6 +802,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? null : String.valueOf(result.get("code96333")));
                 otherInfo.setClaimStatus("已认领");
                 otherInfoMapper.updateById(otherInfo);
+
+                // 更新使用登记业务表
+                jgUseRegistration.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
             }
         }
         // 更新es