Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_bugfix

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/event/service/impl/EquipQualityScoreUpdateService.java

@@ -61,7 +61,7 @@ public class EquipQualityScoreUpdateService extends DefaultQualityScoreUpdateSer
         IdxBizJgUseInfo useInfo = getIdxBizJgUseInfo(record);
         IdxBizJgRegisterInfo registerInfo = getIdxBizJgRegisterInfo(record);
         if (ValidationUtil.isEmpty(useInfo) || ValidationUtil.isEmpty(registerInfo)) {
-            return null;
+            return 0;
         }
         matchItemDto.setBizType(bizType);
         matchItemDto.setEquList(registerInfo.getEquList());
@@ -96,6 +96,9 @@ public class EquipQualityScoreUpdateService extends DefaultQualityScoreUpdateSer
     }
 
     private void sendDataRefreshMsgEquip(List<String> records) {
+        if (ValidationUtil.isEmpty(records)) {
+            return;
+        }
         eventPublisher.publish(new DataRefreshEvent(this, records, DataRefreshEvent.DataType.equipment.name(), DataRefreshEvent.Operation.UPDATE));
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/event/service/impl/ProjectQualityScoreUpdateService.java

@@ -58,7 +58,7 @@ public class ProjectQualityScoreUpdateService extends DefaultQualityScoreUpdateS
     private Integer getReminderLevel(String bizType, String projectContraptionId) {
         IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionService.getById(projectContraptionId);
         if (ValidationUtil.isEmpty(projectContraption)) {
-            return null;
+            return 0;
         }
         MatchItemDto matchItemDto = MatchItemDto.builder().build();
         matchItemDto.setBizType(bizType);
@@ -81,6 +81,9 @@ public class ProjectQualityScoreUpdateService extends DefaultQualityScoreUpdateS
      * @param projectContraptionIds 装置ids
      */
     private void sendDataRefreshMsg(Set<String> projectContraptionIds) {
+        if (ValidationUtil.isEmpty(projectContraptionIds)) {
+            return;
+        }
         List<IdxBizJgUseInfo> useInfos = idxBizJgUseInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>()
                 .in(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionIds)
                 .select(IdxBizJgUseInfo::getRecord));

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

@@ -2395,25 +2395,29 @@ public class DataHandlerServiceImpl {
                     esEquipmentCategoryList.size(), projectContraptionIds.size(), equipRecord.size());
 
             if (!ValidationUtil.isEmpty(equipRecord)) {
-                equipRecord.remove(null);
+                equipRecord.removeIf(Objects::isNull);
                 log.info("发布设备事件，设备数量: {}", equipRecord.size());
-                eventPublisher.publish(new EquipCreateOrEditEvent(
-                        this,
-                        BusinessTypeEnum.JG_NEW_EQUIP.name(),
-                        equipRecord,
-                        EquipCreateOrEditEvent.EquipType.equip
-                ));
+                if (!ValidationUtil.isEmpty(equipRecord)) {
+                    eventPublisher.publish(new EquipCreateOrEditEvent(
+                            this,
+                            BusinessTypeEnum.JG_NEW_EQUIP.name(),
+                            equipRecord,
+                            EquipCreateOrEditEvent.EquipType.equip
+                    ));
+                }
             }
 
             if (!ValidationUtil.isEmpty(projectContraptionIds)) {
-                projectContraptionIds.remove(null);
+                projectContraptionIds.removeIf(Objects::isNull);
                 log.info("发布装置设备事件，设备数量: {}", projectContraptionIds.size());
-                eventPublisher.publish(new EquipCreateOrEditEvent(
-                        this,
-                        BusinessTypeEnum.JG_NEW_PROJECT.name(),
-                        projectContraptionIds,
-                        EquipCreateOrEditEvent.EquipType.project
-                ));
+                if (!ValidationUtil.isEmpty(projectContraptionIds)) {
+                    eventPublisher.publish(new EquipCreateOrEditEvent(
+                            this,
+                            BusinessTypeEnum.JG_NEW_PROJECT.name(),
+                            projectContraptionIds,
+                            EquipCreateOrEditEvent.EquipType.project
+                    ));
+                }
             }
 
             total.addAndGet(esEquipmentCategoryList.size());