添加设备告警

device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceStatTaskImpl.java

@@ -17,10 +17,7 @@ import com.mortals.xhx.common.code.DeviceSourceEnum;
 import com.mortals.xhx.common.key.ParamKey;
 import com.mortals.xhx.common.utils.SendTask;
 import com.mortals.xhx.common.utils.SendTaskThreadPool;
-import com.mortals.xhx.module.device.model.DeviceAlarmEntity;
-import com.mortals.xhx.module.device.model.DeviceEntity;
-import com.mortals.xhx.module.device.model.DeviceLogEntity;
-import com.mortals.xhx.module.device.model.DeviceLogQuery;
+import com.mortals.xhx.module.device.model.*;
 import com.mortals.xhx.module.device.service.DeviceAlarmService;
 import com.mortals.xhx.module.device.service.DeviceLogService;
 import com.mortals.xhx.module.device.service.DeviceService;
@@ -71,9 +68,9 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
 
         try {
             //获取所有设备，针对每个设备查询最近指定秒的日志，如果没有则更新下线
-            List<DeviceEntity> collect = deviceService.getCacheList().stream()
-                    .filter(f -> f.getDeviceSource() == DeviceSourceEnum.大厅.getValue())
-                    .filter(f -> f.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.在线.getValue())
+            List<DeviceEntity> collect = deviceService.find(new DeviceQuery().deviceSource(DeviceSourceEnum.大厅.getValue()).deviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue())).stream()
+//                    .filter(f -> f.getDeviceSource() == DeviceSourceEnum.大厅.getValue())
+//                    .filter(f -> f.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.在线.getValue())
                     .map(device -> {
                         DeviceLogQuery query = new DeviceLogQuery();