Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -229,6 +229,9 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                         .eq(DmpDeviceInfo::getTenantId,SecurityUtils.getTenantId())
                         .eq(DmpDeviceInfo::getDeleteFlag,0);
                 List<DmpDeviceInfo> deviceInfo = dmpDeviceInfoService.list(queryWrapper1);
+                LambdaQueryWrapper<BaseFacilityDevice> lambdaQuery1 = Wrappers.lambdaQuery();
+                lambdaQuery1.in(BaseFacilityDevice::getDeviceId,devList);
+                List<BaseFacilityDevice> records1 = baseFacilityDeviceService.list(lambdaQuery1);
                 if(CollectionUtils.isNotEmpty(deviceInfo)){
                     for(int i=0;i<records.size();i++){
                         for(int j=0;j<deviceInfo.size();j++){
@@ -238,7 +241,12 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                                 break;
                             }
                         }
-
+                        for(int k=0;k<records1.size();k++){
+                            if(records.get(i).getDeviceId().equals(records1.get(k).getDeviceId())){
+                                records.get(i).setFacilityId(records1.get(k).getFacilityId());
+                                break;
+                            }
+                        }
                     }
                 }
             }