From 3497e41e5d337f771ce75fa63bb19b151fb84d41 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 22 Nov 2021 14:46:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ResiCategoryStatsConfigServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java index 3cdcd7944f..9759eb2b9c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java @@ -81,16 +81,16 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf //3.新增不存在的，删除不在tableColumnMap的 Map statsTableColumnMap = new HashMap<>(); - statsConfigEntityList.stream().forEach(item->{ + statsConfigEntityList.forEach(item->{ statsTableColumnMap.put(item.getTableName()+"-"+item.getColumnName(),item); }); Map warnTableColumnMap = new HashMap<>(); - warnConfigEntityList.stream().forEach(item->{ + warnConfigEntityList.forEach(item->{ warnTableColumnMap.put(item.getTableName()+"-"+item.getColumnName(),item); }); //差集 //新增 - List newStatsList = tableColumnMap.keySet().stream().filter(item -> !statsTableColumnMap.keySet().contains(item)).collect(Collectors.toList()); + List newStatsList = tableColumnMap.keySet().stream().filter(item -> !statsTableColumnMap.containsKey(item)).collect(Collectors.toList()); List newStatsEntityList = new ArrayList<>(); newStatsList.forEach(item->{ @@ -114,8 +114,8 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf List delStatsEntityIdList = new ArrayList<>(); List delWarnEntityIdList = new ArrayList<>(); //需要删除的 - List delStatsList = statsTableColumnMap.keySet().stream().filter(item -> !tableColumnMap.keySet().contains(item)).collect(Collectors.toList()); - List delWarnList = warnTableColumnMap.keySet().stream().filter(item -> !tableColumnMap.keySet().contains(item)).collect(Collectors.toList()); + List delStatsList = statsTableColumnMap.keySet().stream().filter(item -> !tableColumnMap.containsKey(item)).collect(Collectors.toList()); + List delWarnList = warnTableColumnMap.keySet().stream().filter(item -> !tableColumnMap.containsKey(item)).collect(Collectors.toList()); delStatsList.forEach(item->{ delStatsEntityIdList.add(statsTableColumnMap.get(item).getId()); }); From 595fac05ff4fedf9080ecf98134f2276d2e4c6b0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 22 Nov 2021 15:44:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?user=20=E6=B5=8B=E8=AF=95=20=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83mq=20consumer=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 08b20aeaa5..e6c7655e35 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -319,7 +319,7 @@ true - 192.168.1.140:9876;192.168.1.141:9876 + 192.168.10.161:9876 @@ -362,7 +362,7 @@ true - 192.168.1.140:9876;192.168.1.141:9876 + 192.168.11.187:9876;192.168.11.184:9876