添加设备上线和下线的业务日志记录

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

@@ -181,6 +181,8 @@ public class DeviceAlarmInfoServiceImpl extends AbstractCRUDServiceImpl<DeviceAl
                 });
             });
 
+            infoList.stream().
+
             return Rest.ok(infoList);
         } catch (Exception e) {
             log.error("设备告警信息统计异常", e);

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

@@ -98,12 +98,15 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
                     billInfos = this.getBillInfos(query.getSiteId(), query.getCreateTimeStart(), TimeUnitEnum.MONTH.getValue(), page, context);
                     deviceStatEntityResult.setList(billInfos);
                     deviceStatEntityResult.setPageInfo(page);
+
+                    updateDeviceOnlineStats(query, context, page, billInfos);
                     break;
                 case 今年:
                     page.setPrePageResult(1);
                     billInfos = this.getBillInfos(query.getSiteId(), query.getCreateTimeStart(), TimeUnitEnum.YEAR.getValue(), page, context);
                     deviceStatEntityResult.setList(billInfos);
                     deviceStatEntityResult.setPageInfo(page);
+                    updateDeviceOnlineStats(query, context, page, billInfos);
                     break;
                 default:
                     break;
@@ -114,6 +117,24 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
         }
     }
 
+    private void updateDeviceOnlineStats(DeviceStatEntity query, Context context, PageInfo page, List<DeviceStatEntity> billInfos) {
+        //统计在线离线未激活的数据用当天
+        DeviceStatQuery deviceStatQuery = new DeviceStatQuery();
+        deviceStatQuery.setSiteId(query.getSiteId());
+        deviceStatQuery.setSelected(DaySelectEnum.今天.getValue());
+        PageInfo page1 = new PageInfo();
+        page.setPrePageResult(1);
+        List<DeviceStatEntity> infos = this.getBillInfos(deviceStatQuery.getSiteId(), deviceStatQuery.getCreateTimeStart(), TimeUnitEnum.DAY.getValue(), page1, context);
+        if(!ObjectUtils.isEmpty(infos)){
+            DeviceStatEntity deviceStatEntity = infos.get(0);
+            billInfos.forEach(item->{
+                item.setDeviceOnlineCount(deviceStatEntity.getDeviceOnlineCount());
+                item.setDeviceOfflineCount(deviceStatEntity.getDeviceOfflineCount());
+                item.setDeviceUnActiveCount(deviceStatEntity.getDeviceUnActiveCount());
+            });
+        }
+    }
+
     @Override
     public List<DeviceStatEntity> getBillInfos(Long siteId, String createTimeStart, Integer datePattern, PageInfo pageInfo, Context context) {
         List<DeviceStatEntity> statList = new ArrayList<>();
@@ -163,8 +184,6 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
             deviceStatEntity.setMonth(calendar.get(Calendar.MONTH) + 1);
             deviceStatEntity.setDay(calendar.get(Calendar.DAY_OF_MONTH));
         }
-
-
         //获取昨天统计数据
         DeviceStatEntity yesterdayDeviceStat = this.selectOne(new DeviceStatQuery()
                 .siteId(siteId)