|
|
@@ -111,12 +111,28 @@ public class DeviceGatewayImpl implements DeviceGateway {
|
|
|
List<DeviceDTO> deviceDTOs = new ArrayList<>();
|
|
|
List<DevInfo> devInfos = devInfoService.queryDeviceList(userId, null, null, sharedDevIds.orElse(Collections.emptyList()));
|
|
|
|
|
|
+ // 统计设备总数和告警数量
|
|
|
+ int totalDevices = 0;
|
|
|
+ int warningDevices = 0;
|
|
|
+
|
|
|
for (DevInfo devInfo : devInfos) {
|
|
|
DeviceDTO dto = new DeviceDTO();
|
|
|
BeanUtils.copyProperties(devInfo, dto);
|
|
|
deviceDTOs.add(dto);
|
|
|
+
|
|
|
+ // 统计设备数量
|
|
|
+ totalDevices++;
|
|
|
+ // 统计告警数量(dev_warn为1的设备)
|
|
|
+ if (devInfo.getDevWarn() != null && devInfo.getDevWarn() == 1) {
|
|
|
+ warningDevices++;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
homeInfoDTO.setDeviceList(deviceDTOs);
|
|
|
+ // 设置设备总数
|
|
|
+ homeInfoDTO.setDevNum(totalDevices);
|
|
|
+ // 设置告警数量
|
|
|
+ homeInfoDTO.setWarnNum(warningDevices);
|
|
|
|
|
|
/*
|
|
|
* 查询群组数量
|