From 8b1a9a0235ac55bbfdd3d0551c3227a8dded89df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=B2=E5=85=88=E7=94=9F?= <821039958@qq.com> Date: Thu, 31 Jul 2025 10:52:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E4=BB=BD=E6=98=A0=E5=B0=84=E7=9C=81?= =?UTF-8?q?=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resp/dataAnalysis/DataAnalysisResp.java | 4 +-- .../Impl/DataAnalysisServiceImpl.java | 32 ++++++++++++++++++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/dataAnalysis/DataAnalysisResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/dataAnalysis/DataAnalysisResp.java index c9cc3012..a62820e6 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/dataAnalysis/DataAnalysisResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/dataAnalysis/DataAnalysisResp.java @@ -81,8 +81,8 @@ public class DataAnalysisResp { @Data public static class ResourceDistCount{ private static final List CITIES = List.of( - "北京", "上海", "天津", "重庆", - "成都", "长沙" + "北京市", "上海市", "天津市", "重庆市", + "成都市", "长沙市" ); /** * 机器id diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java index aa9c2d1a..f995053c 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java @@ -38,6 +38,32 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { @Resource private MachineInfoMapper machineInfoMapper; + private static final Map provinceCapitalMap = new HashMap<>(); + static { + provinceCapitalMap.put("河北省", "石家庄市"); + provinceCapitalMap.put("山西", "太原"); + provinceCapitalMap.put("辽宁", "沈阳"); + provinceCapitalMap.put("吉林", "长春"); + provinceCapitalMap.put("黑龙江", "哈尔滨"); + provinceCapitalMap.put("江苏省", "南京市"); + provinceCapitalMap.put("浙江", "杭州"); + provinceCapitalMap.put("安徽", "合肥"); + provinceCapitalMap.put("福建", "福州"); + provinceCapitalMap.put("江西", "南昌"); + provinceCapitalMap.put("山东", "济南"); + provinceCapitalMap.put("河南", "郑州"); + provinceCapitalMap.put("湖北省", "武汉市"); + provinceCapitalMap.put("湖南省", "长沙市"); + provinceCapitalMap.put("广东省", "广州市"); + provinceCapitalMap.put("海南", "海口"); + provinceCapitalMap.put("四川省", "成都市"); + provinceCapitalMap.put("贵州", "贵阳"); + provinceCapitalMap.put("云南", "昆明"); + provinceCapitalMap.put("陕西", "西安"); + provinceCapitalMap.put("甘肃", "兰州"); + provinceCapitalMap.put("青海", "西宁"); + } + @Override public String getUseUserSUM(String city) { return userMapper.selectCount().toString(); @@ -92,13 +118,17 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { return distCount; }).collect(Collectors.toList()); if (Objects.nonNull(city)) { - return distCountList.stream().filter(a -> city.equals(a.getCountry())).toList(); + String srt = Optional.ofNullable(provinceCapitalMap.get(city)).orElse(city); + return distCountList.stream().filter(a -> srt.equals(a.getCountry())).toList(); } return distCountList; } @Override public List getVulMonitorCountList(String city) { + if (Objects.nonNull(city)) { + city = Optional.ofNullable(provinceCapitalMap.get(city)).orElse(city); + } return vulInfoDao.selectList(new QueryWrapper().lambda().eq(Objects.nonNull(city),VulInfo::getCity,city).orderByDesc(VulInfo::getCreateTime)); }