diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java index e9572f29c..b1aef68e2 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java @@ -138,7 +138,7 @@ public class OverviewServiceImpl implements OverviewService { //数据统计(配网监测点) List distributionMonitors = overviewMapper.selectListAll(deptListCode); Map distributionMonitorMap = - distributionMonitors.stream().collect(Collectors.toMap(DistributionMonitorVO::getMonitorId, Function.identity())); + distributionMonitors.stream().collect(Collectors.toMap(DistributionMonitorVO::getMonitorId, Function.identity(),(key1,key2)->key2)); //数据 key:监测点类别 value:数量 Map map = distributionMonitors.stream().collect(Collectors.groupingBy(dm -> dm.getMonitorSort(), Collectors.counting())); diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java index 0a6e1eda0..ebf6d3ba2 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java @@ -83,7 +83,7 @@ public class UserServiceImpl extends ServiceImpl implements IU private final DicDataFeignClient dicDataFeignClient; - private final PqsTerminalLogsClient pqsTerminalLogsClient; +// private final PqsTerminalLogsClient pqsTerminalLogsClient; private final AreaFeignClient areaFeignClient; @@ -196,7 +196,7 @@ public class UserServiceImpl extends ServiceImpl implements IU terminalLogsNew.setCreateTime(LocalDateTime.now()); terminalLogsNew.setTerminalType(data.getId()); terminalLogsNew.setState(1); - pqsTerminalLogsClient.saveLogs(terminalLogsNew); +// pqsTerminalLogsClient.saveLogs(terminalLogsNew); return true; } else { return false;