diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java index e7c8557..24f6bbf 100644 --- a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java +++ b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java @@ -255,7 +255,7 @@ public class SummaryServiceImpl implements SummaryService { private static void addKNPCDeviceSummary(String productName, Map> deviceGroup, Map onlineMap, List pieSummaryVOList, String title) { List knpcDeviceList = deviceGroup.get(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); } else { 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.setChartName(productName); pieSummaryVO.setTitle(title); - if (Objects.isNull(knpcDeviceList)) { + if (ObjectUtils.isNotEmpty(knpcDeviceList)) { //根据设备列表查找在线map中的状态进行统计在线数量 int onLineCount = 0, offLineCount = 0; for (DeviceVO deviceVO : knpcDeviceList) {