mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

省份映射省会

Browse Source
This commit is contained in:
蒲先生 2025-07-31 10:52:09 +08:00
parent 83dced9c88
commit 8b1a9a0235
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/dataAnalysis/DataAnalysisResp.java
View File

@ -81,8 +81,8 @@ public class DataAnalysisResp {
@Data @Data
public static class ResourceDistCount{ public static class ResourceDistCount{
private static final List<String> CITIES = List.of( private static final List<String> CITIES = List.of(
"北京", "上海", "天津", "重庆", "北京市", "上海市", "天津市", "重庆市",
"成都", "长沙" "成都市", "长沙市"
); );
/** /**
* 机器id * 机器id

32
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java
View File

@ -38,6 +38,32 @@ public class DataAnalysisServiceImpl implements DataAnalysisService {
@Resource @Resource
private MachineInfoMapper machineInfoMapper; private MachineInfoMapper machineInfoMapper;
private static final Map<String, String> 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 @Override
public String getUseUserSUM(String city) { public String getUseUserSUM(String city) {
return userMapper.selectCount().toString(); return userMapper.selectCount().toString();
@ -92,13 +118,17 @@ public class DataAnalysisServiceImpl implements DataAnalysisService {
return distCount; return distCount;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
if (Objects.nonNull(city)) { 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; return distCountList;
} }
@Override @Override
public List<VulInfo> getVulMonitorCountList(String city) { public List<VulInfo> getVulMonitorCountList(String city) {
if (Objects.nonNull(city)) {
city = Optional.ofNullable(provinceCapitalMap.get(city)).orElse(city);
}
return vulInfoDao.selectList(new QueryWrapper<VulInfo>().lambda().eq(Objects.nonNull(city),VulInfo::getCity,city).orderByDesc(VulInfo::getCreateTime)); return vulInfoDao.selectList(new QueryWrapper<VulInfo>().lambda().eq(Objects.nonNull(city),VulInfo::getCity,city).orderByDesc(VulInfo::getCreateTime));
} }