From a009f21d61db7be0c452b8c7a83b6b8248e81c88 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 27 Apr 2023 13:51:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3pms=E6=A6=82=E8=A7=88?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=8D=A0=E6=AF=94Bug=202.=E8=A7=A3=E5=86=B3p?=
 =?UTF-8?q?ms=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/service/majornetwork/impl/OverviewServiceImpl.java    | 2 +-
 .../main/java/com/njcn/user/service/impl/UserServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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<DistributionMonitorVO> distributionMonitors = overviewMapper.selectListAll(deptListCode);
             Map<String, DistributionMonitorVO> 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<String, Long> 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<UserMapper, User> 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<UserMapper, User> implements IU
             terminalLogsNew.setCreateTime(LocalDateTime.now());
             terminalLogsNew.setTerminalType(data.getId());
             terminalLogsNew.setState(1);
-            pqsTerminalLogsClient.saveLogs(terminalLogsNew);
+//            pqsTerminalLogsClient.saveLogs(terminalLogsNew);
             return true;
         } else {
             return false;