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()); });