1.管道刷历史数据,生产环境异常数据适配

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

@@ -576,6 +576,9 @@ public class DataHandlerServiceImpl {
         Map<Long, List<String>> projectContraptionIdRecordsMap = new HashMap<>();
         for(JgInstallationNotice installationNotice : noticeList){
             List<JgInstallationNoticeEq> noticeEqs = installationNoticeEqService.list(new LambdaQueryWrapper<JgInstallationNoticeEq>().eq(JgInstallationNoticeEq::getEquipTransferId, installationNotice.getSequenceNbr()).select(JgInstallationNoticeEq::getEquId,JgInstallationNoticeEq::getInformNumber));
+            if(noticeEqs.isEmpty()){
+                continue;
+            }
             List<String> records = noticeEqs.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
             List<IdxBizJgUseInfo> useInfos  = useInfoService.lambdaQuery()
             .in(IdxBizJgUseInfo::getRecord, records)
@@ -756,6 +759,7 @@ public class DataHandlerServiceImpl {
     private void updateProjectContraptionAfter(JgUseRegistration useRegistration, JgInstallationNotice installationNotice) {
         // 特殊处理 将任意一个的 record 放入到remark字段
         IdxBizJgUseInfo useInfo = getIdxBizJgUseInfo(installationNotice.getRemark());
+        if(useInfo != null){
             LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(BaseEntity::getSequenceNbr, installationNotice.getProjectContraptionId());
             updateWrapper.set(IdxBizJgProjectContraption::getUscUnitCreditCode ,null);
@@ -773,9 +777,11 @@ public class DataHandlerServiceImpl {
             updateWrapper.set(IdxBizJgProjectContraption::getUseDate, useRegistration.getAuditPassDate());
             projectContraptionService.update(null, updateWrapper);
         }
+    }
 
     private void createProjectInspectInfoAfter(JgUseRegistration useRegistration) {
         JgRegistrationHistory jgRegistrationHistory = getRegistrationHistory(useRegistration.getSequenceNbr() + "");
+        if(jgRegistrationHistory != null){
             JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             IdxBizJgProjectInspection inspectionDetectionInfo = new IdxBizJgProjectInspection();
             BeanUtil.copyProperties(mapData, inspectionDetectionInfo);
@@ -806,6 +812,8 @@ public class DataHandlerServiceImpl {
             projectInspectionMapper.insert(inspectionDetectionInfo);
         }
 
+    }
+
     private IdxBizJgUseInfo getIdxBizJgUseInfo(String record) {
         return useInfoService.getOneData(record);
     }