饼图查询异常修改

This commit is contained in:
wangshilong 2025-02-28 23:09:28 +08:00
parent 7b2efe8b35
commit c03c3a70ba
1 changed files with 2 additions and 2 deletions

View File

@ -255,7 +255,7 @@ public class SummaryServiceImpl implements SummaryService {
private static void addKNPCDeviceSummary(String productName, Map<String, List<DeviceVO>> deviceGroup, Map<String, String> onlineMap, List<PieSummaryVO> pieSummaryVOList, String title) { private static void addKNPCDeviceSummary(String productName, Map<String, List<DeviceVO>> deviceGroup, Map<String, String> onlineMap, List<PieSummaryVO> pieSummaryVOList, String title) {
List<DeviceVO> knpcDeviceList = deviceGroup.get(productName); List<DeviceVO> knpcDeviceList = deviceGroup.get(productName);
if (Objects.equals(WEPS_PLUG_MODBUS_TYPE, productName)) { if (Objects.equals(WEPS_PLUG_MODBUS_TYPE, productName)) {
if (ObjectUtils.isNotEmpty(knpcDeviceList)) { if (ObjectUtils.isEmpty(knpcDeviceList)) {
knpcDeviceList = deviceGroup.get(MI_WEPS_PLUG_MODBUS_TYPE); knpcDeviceList = deviceGroup.get(MI_WEPS_PLUG_MODBUS_TYPE);
} else { } else {
knpcDeviceList.addAll(Optional.ofNullable(deviceGroup.get(MI_WEPS_PLUG_MODBUS_TYPE)).orElse(List.of())); knpcDeviceList.addAll(Optional.ofNullable(deviceGroup.get(MI_WEPS_PLUG_MODBUS_TYPE)).orElse(List.of()));
@ -264,7 +264,7 @@ public class SummaryServiceImpl implements SummaryService {
PieSummaryVO pieSummaryVO = new PieSummaryVO(); PieSummaryVO pieSummaryVO = new PieSummaryVO();
pieSummaryVO.setChartName(productName); pieSummaryVO.setChartName(productName);
pieSummaryVO.setTitle(title); pieSummaryVO.setTitle(title);
if (Objects.isNull(knpcDeviceList)) { if (ObjectUtils.isNotEmpty(knpcDeviceList)) {
//根据设备列表查找在线map中的状态进行统计在线数量 //根据设备列表查找在线map中的状态进行统计在线数量
int onLineCount = 0, offLineCount = 0; int onLineCount = 0, offLineCount = 0;
for (DeviceVO deviceVO : knpcDeviceList) { for (DeviceVO deviceVO : knpcDeviceList) {