1.按照宝鸡特检院增加报检返回字段及结果接收调整

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultDataModel.java

@@ -82,4 +82,9 @@ public class JyjcInspectionResultDataModel {
      */
     private String traceId;
 
+    /**
+     * 设备唯一标识，record--首检时需要，此时设备无监管码及设备代码
+     */
+    private String equipId;
+
 }

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

@@ -114,6 +114,8 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
     @Autowired
     JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
 
+    @Autowired
+    IdxBizJgDesignInfoMapper designInfoMapper;
 
 
     /**
@@ -215,9 +217,11 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
             // 注册信息
             this.setRegisterInfo(equipData, e.getEquipUnicode());
             // 制造信息
-            this.setProductData(equipData,e.getEquipUnicode());
+            this.setProductData(equipData, e.getEquipUnicode());
+            // 设计信息
+            this.setDesignInfo(equipData, e.getEquipUnicode());
             // 维保单位信息
-            this.setMaintenanceInfo(equipData,e.getEquipUnicode());
+            this.setMaintenanceInfo(equipData, e.getEquipUnicode());
             // 单个查询执行，原因数据量较大 in 慢
             this.setOtherInfo(equipData, e.getEquipUnicode(), applicationModel.getInspectionType());
             // 单个查询执行，原因数据量较大 in 慢
@@ -226,11 +230,20 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
         }).collect(Collectors.toList());
     }
 
+    private void setDesignInfo(InspectionEquipData equipData, String equipUnicode) {
+        IdxBizJgDesignInfo designInfo = designInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgDesignInfo>()
+                .eq(IdxBizJgDesignInfo::getRecord, equipUnicode)
+                .select(IdxBizJgDesignInfo::getRecord, IdxBizJgDesignInfo::getDesignUseDate));
+        if (designInfo != null) {
+            equipData.setDesignUseDate(designInfo.getDesignUseDate());
+        }
+    }
+
     private void setMaintenanceInfo(InspectionEquipData equipData, String equipUnicode) {
         MaintenanceInfo maintenanceInfo = maintenanceInfoMapper.selectOne(new LambdaQueryWrapper<MaintenanceInfo>()
                 .eq(AbstractEquipBaseEntity::getRecord, equipUnicode)
-                .select(MaintenanceInfo::getRecord,MaintenanceInfo::getMeUnitCreditCode,MaintenanceInfo::getMeUnitName));
-        if(maintenanceInfo != null){
+                .select(MaintenanceInfo::getRecord, MaintenanceInfo::getMeUnitCreditCode, MaintenanceInfo::getMeUnitName));
+        if (maintenanceInfo != null) {
             equipData.setMeUnitCreditCode(maintenanceInfo.getMeUnitCreditCode());
             equipData.setMeUnitName(maintenanceInfo.getMeUnitName());
         }
@@ -239,7 +252,7 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
     private void setUseInfo(InspectionEquipData equipData, String equipUnicode) {
         IdxBizJgUseInfo idxBizJgUseInfo = useInfoMapper.selectOne(
                 new LambdaQueryWrapper<IdxBizJgUseInfo>()
-                .eq(IdxBizJgUseInfo::getRecord, equipUnicode)
+                        .eq(IdxBizJgUseInfo::getRecord, equipUnicode)
         );
         equipData.setUseInnerCode(idxBizJgUseInfo.getUseInnerCode());
         equipData.setAddress(getAddressByRecord(idxBizJgUseInfo));
@@ -253,7 +266,7 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
 
     private void setRegisterInfo(InspectionEquipData equipData, String equipUnicode) {
         LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.select(IdxBizJgRegisterInfo::getEquType,IdxBizJgRegisterInfo::getRecord);
+        wrapper.select(IdxBizJgRegisterInfo::getEquType, IdxBizJgRegisterInfo::getRecord);
         wrapper.eq(IdxBizJgRegisterInfo::getRecord, equipUnicode);
         wrapper.select(IdxBizJgRegisterInfo::getRecord,
                 IdxBizJgRegisterInfo::getEquType,
@@ -280,8 +293,8 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
     }
 
     private void setProductData(InspectionEquipData equipData, String record) {
-        IdxBizJgFactoryInfo idxBizJgFactoryInfo = factoryInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgFactoryInfo>().eq(IdxBizJgFactoryInfo::getRecord,record));
-        if(idxBizJgFactoryInfo != null) {
+        IdxBizJgFactoryInfo idxBizJgFactoryInfo = factoryInfoMapper.selectOne(new LambdaQueryWrapper<IdxBizJgFactoryInfo>().eq(IdxBizJgFactoryInfo::getRecord, record));
+        if (idxBizJgFactoryInfo != null) {
             equipData.setFactoryNum(idxBizJgFactoryInfo.getFactoryNum());
             equipData.setProduceUnitCreditCode(idxBizJgFactoryInfo.getProduceUnitCreditCode());
             equipData.setProduceUnitName(idxBizJgFactoryInfo.getProduceUnitName());