修改统计逻辑

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceMessageStatServiceImpl.java

@@ -75,6 +75,7 @@ public class DeviceMessageStatServiceImpl extends AbstractCRUDServiceImpl<Device
                 deviceAlarmInfoQuery.setCreateTimeStart(DateUtils.getCurrStrDate());
                 deviceAlarmInfoQuery.setCreateTimeEnd(DateUtils.getCurrStrDate());
                 deviceAlarmInfoQuery.setProductId(productEntity.getId());
+                deviceAlarmInfoQuery.setSiteId(siteId);
 
                 int alarmTotalCount = deviceAlarmInfoService.count(deviceAlarmInfoQuery, null);
                 deviceStatEntity.setAlarmTotalCount(alarmTotalCount);

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceStatServiceImpl.java

@@ -268,6 +268,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
 
                 //今日告警数量
                 DeviceAlarmInfoQuery deviceAlarmInfoQuery = new DeviceAlarmInfoQuery();
+                deviceAlarmInfoQuery.setSiteId(siteId);
                 deviceAlarmInfoQuery.setCreateTimeStart(DateUtils.getCurrStrDate());
                 deviceAlarmInfoQuery.setCreateTimeEnd(DateUtils.getCurrStrDate());
 
@@ -277,6 +278,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
 
                 //推送数量
                 AlarmSmsSendQuery alarmSmsSendQuery = new AlarmSmsSendQuery();
+                alarmSmsSendQuery.setSiteId(siteId);
                 alarmSmsSendQuery.setSendTimeStart(DateUtils.getCurrStrDate());
                 alarmSmsSendQuery.setSendTimeEnd(DateUtils.getCurrStrDate());
                 alarmSmsSendQuery.setSendStatus(SendStatusEnum.发送成功.getValue());
@@ -287,6 +289,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
 
                 //上行下行数量
                 DeviceLogQuery deviceLogQuery = new DeviceLogQuery();
+                deviceLogQuery.setSiteId(siteId);
                 deviceLogQuery.setCreateTimeStart(DateUtils.getCurrStrDate());
                 deviceLogQuery.setCreateTimeEnd(DateUtils.getCurrStrDate());
                 deviceLogQuery.setLogType(LogTypeEnum.上报事件.getValue());