fix(jyjc):登记机关名称处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistrationManage.java

@@ -208,12 +208,4 @@ public class JgUseRegistrationManage extends BaseEntity {
      */
     @TableField("change_reason")
     private String changeReason;
-
-    /**
-     *
-     * 登记机关名称
-     */
-    @TableField("reg_unit_name")
-    private String regUnitName;
-
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionApplicationPushEventListener.java

@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionApplicationPushEven
 import com.yeejoin.amos.boot.module.jyjc.biz.kafka.KafkaProducer;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationEquipServiceImpl;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationPushLogServiceImpl;
+import com.yeejoin.amos.boot.module.jyjc.biz.util.JsonUtils;
 import com.yeejoin.amos.boot.module.jyjc.biz.util.JyjcConstant;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
@@ -28,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationListener;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -45,6 +47,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class InspectionApplicationPushEventListener implements ApplicationListener<InspectionApplicationPushEvent> {
 
+    @Value("classpath:/json/companyCodeRegName.json")
+    private Resource regNameJson;
+
+    private Map<String, String> companyCodeRegNameMap;
+
     private BlockingQueue<JyjcInspectionApplicationModel> queue = new LinkedBlockingQueue<>();
 
     @Value("${inspection.push.max.deal.thread.num:2}")
@@ -133,6 +140,7 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
 
     @PostConstruct
     public void init() {
+        companyCodeRegNameMap = JsonUtils.getResourceJson(regNameJson);
         ExecutorService executorService = Executors.newFixedThreadPool(threadNum);
         // 可处理的检验检测类型，目前只处理检验的，不处理检测业务
         List<String> canDealInspectionTypes = getCanDealInspectionType();
@@ -259,13 +267,14 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
             equipData.setUseCertFilePath(jgRegisterInfo.getLastUseCertFilePath());
         }
         // 登记机关
-        if(equipData.getUseRegistrationCode() != null){
+        if (equipData.getUseRegistrationCode() != null) {
             LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, equipData.getUseRegistrationCode())
-                    .eq(JgUseRegistrationManage::getIsDelete, 0).select(JgUseRegistrationManage::getRegUnitName,BaseEntity::getSequenceNbr);
-            JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageMapper.selectOne(queryWrapper);
-            if(jgUseRegistrationManage != null){
-                equipData.setRegUnitName(jgUseRegistrationManage.getRegUnitName());
+                    .eq(JgUseRegistrationManage::getIsDelete, 0)
+                    .select(JgUseRegistrationManage::getReceiveCompanyCode, BaseEntity::getSequenceNbr);
+            JgUseRegistrationManage manage = jgUseRegistrationManageMapper.selectOne(queryWrapper);
+            if (manage != null) {
+                equipData.setRegUnitName(companyCodeRegNameMap.getOrDefault(manage.getReceiveCompanyCode(), manage.getReceiveOrgName()));
             }
         }
     }