boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (farm): 微信端设备统计接口

Browse Source 
-
This commit is contained in:
达富斌
2025-10-15 23:09:55 +08:00
parent 4dfba260d7
commit 4ce3c7dcc4
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/wx/vo/DeviceStatisticsInfoRespVO.java
View File

@@ -20,8 +20,8 @@ public class DeviceStatisticsInfoRespVO {
@Schema(description = "设备总数") @Schema(description = "设备总数")
private int totalNum; private int totalNum;
@Schema(description = "在线设备数") @Schema(description = "在线设备数")
private int onlineNum; private long onlineNum;
@Schema(description = "离线设备数") @Schema(description = "离线设备数")
private int offlineNum; private long offlineNum;
} }

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java
View File

@@ -395,15 +395,13 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
List<DeviceInfoDO> list = entry.getValue(); List<DeviceInfoDO> list = entry.getValue();
int onlineCount = list.stream() long onlineCount = list.stream()
.filter(device -> device.getDeviceState() == 1) .filter(device -> device.getDeviceState() == 1)
.mapToInt(DeviceInfoDO::getDeviceState) .collect(Collectors.counting());
.sum();
int offlineCount = list.stream() long offlineCount = list.stream()
.filter(device -> device.getDeviceState() != 1) .filter(device -> device.getDeviceState() != 1)
.mapToInt(DeviceInfoDO::getDeviceState) .collect(Collectors.counting());
.sum();
res.add(new DeviceStatisticsInfoRespVO(keyName,list.size(),onlineCount,offlineCount)); res.add(new DeviceStatisticsInfoRespVO(keyName,list.size(),onlineCount,offlineCount));
} }