fix: 区域固化过滤已删除设备

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderCoordinateRecordServiceImpl.java

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets;
+import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.elder.PlatElderCoordinateRecord;
 import com.makeit.entity.platform.elder.PlatElderCoordinateRecord;
 import com.makeit.entity.platform.space.PlatRegionSetting;
 import com.makeit.entity.platform.space.PlatRegionSetting;
 import com.makeit.entity.platform.space.PlatRegionSettingFix;
 import com.makeit.entity.platform.space.PlatRegionSettingFix;
 import com.makeit.mapper.platform.elder.PlatElderCoordinateRecordMapper;
 import com.makeit.mapper.platform.elder.PlatElderCoordinateRecordMapper;
+import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.platform.elder.PlatElderCoordinateRecordService;
 import com.makeit.service.platform.elder.PlatElderCoordinateRecordService;
 import com.makeit.service.platform.elder.PlatElderDayReportDayService;
 import com.makeit.service.platform.elder.PlatElderDayReportDayService;
 import com.makeit.service.platform.elder.PlatElderRealTimeService;
 import com.makeit.service.platform.elder.PlatElderRealTimeService;
@@ -52,7 +54,7 @@ public class PlatElderCoordinateRecordServiceImpl extends ServiceImpl<PlatElderC
     @Autowired
     @Autowired
     private PlatRegionSettingService platRegionSettingService;
     private PlatRegionSettingService platRegionSettingService;
     @Autowired
     @Autowired
-    private PlatElderRealTimeService platElderRealTimeService;
+    private PlatDeviceService platDeviceService;
 
 
     @Override
     @Override
     public void coordinateRecordTask() {
     public void coordinateRecordTask() {
@@ -90,6 +92,10 @@ public class PlatElderCoordinateRecordServiceImpl extends ServiceImpl<PlatElderC
             }
             }
             saveBatch(list);
             saveBatch(list);
         }
         }
+        List<String> deviceIds = StreamUtil.map(platRegionSettingList, setting -> setting.getDeviceId());
+        List<PlatDevice> platDevices = platDeviceService.listByIds(deviceIds);
+        Map<String, String> deviceMap = StreamUtil.toMap(platDevices, PlatDevice::getId, PlatDevice::getId);
+        platRegionSettingList = StreamUtil.filter(platRegionSettingList, setting -> deviceMap.containsKey(setting.getDeviceId()));
         List<PlatRegionSettingFix> settingFixList = StreamUtil.map(platRegionSettingList, setting -> {
         List<PlatRegionSettingFix> settingFixList = StreamUtil.map(platRegionSettingList, setting -> {
             PlatRegionSettingFix settingFix = new PlatRegionSettingFix();
             PlatRegionSettingFix settingFix = new PlatRegionSettingFix();
             BeanUtils.copyProperties(setting, settingFix,"id");
             BeanUtils.copyProperties(setting, settingFix,"id");