diff --git a/zc-business/src/main/java/com/zc/business/domain/DcSwitch.java b/zc-business/src/main/java/com/zc/business/domain/DcSwitch.java index 9fd63400..d8203d33 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcSwitch.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcSwitch.java @@ -117,6 +117,6 @@ public class DcSwitch { * 故障数量 */ private int numberOfFaults; - private Map> dcDeviceList; + private List dcDeviceList; } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcSwitchServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcSwitchServiceImpl.java index 5d77cf24..8616e648 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcSwitchServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcSwitchServiceImpl.java @@ -98,10 +98,7 @@ public class DcSwitchServiceImpl extends ServiceImpl i if (StringUtils.isNotEmpty(dcSwitch.getDeviceList())) { // 说明是设备交换机 List deviceList = getDeviceList(dcSwitch.getDeviceList()); - if (deviceList.size() > 0) { - Map> collect = deviceList.stream().collect(Collectors.groupingBy(DcDevice::getDeviceType)); - dcSwitch.setDcDeviceList(collect); - } + dcSwitch.setDcDeviceList(deviceList); } }catch (Exception e) { e.printStackTrace();