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

Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro

Browse Source
This commit is contained in:
even 2025-07-30 15:48:41 +08:00
commit 0f2782dacb
4 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/module-ci-process-api/src/main/java/cd/casic/ci/api/DataAnalysisController.java
View File

@ -25,26 +25,26 @@ public class DataAnalysisController {
@Operation(summary = "人数，任务次数，漏洞总数，高危漏洞 统计")
@GetMapping("/userAndTaskCount")
public CommonResult userAndTaskDataCount(@RequestParam(required = false,value = "country") String country){
return CommonResult.success(dataAnalysisService.getUserAndTaskDataCount());
public CommonResult userAndTaskDataCount(@RequestParam(required = false,value = "city") String city){
return CommonResult.success(dataAnalysisService.getUserAndTaskDataCount(city));
}
@Operation(summary = "漏洞监测分布概览")
@GetMapping("/HoopVulCount")
public CommonResult HoopVulDataCount(@RequestParam(required = false,value = "country") String country){
public CommonResult HoopVulDataCount(@RequestParam(required = false,value = "city") String city){
return CommonResult.success(dataAnalysisService.getHoopVulCountList());
}
@Operation(summary = "资源分配数据概览")
@GetMapping("/ResourceDistList")
public CommonResult ResourceDistList(@RequestParam(required = false,value = "country") String country){
return CommonResult.success(dataAnalysisService.getResourceDistCountList());
public CommonResult ResourceDistList(@RequestParam(required = false,value = "city") String city){
return CommonResult.success(dataAnalysisService.getResourceDistCountList(city));
}
@Operation(summary = "漏洞监测数据概览")
@GetMapping("/VulMonitorDataList")
public CommonResult VulMonitorDataList(@RequestParam(required = false,value = "country") String country){
return CommonResult.success(dataAnalysisService.getVulMonitorCountList());
public CommonResult VulMonitorDataList(@RequestParam(required = false,value = "city") String city){
return CommonResult.success(dataAnalysisService.getVulMonitorCountList(city));
}

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

@ -61,15 +61,18 @@ public class DataAnalysisResp {
* 漏洞监测分布概览
*/
@Data
@Builder
public static class HoopVulCount{
/**
* 城市
*/
private String country;
private String city;
/**
* 百分比 两位小数
*/
private BigDecimal value;
private String count;
}
/**
@ -78,8 +81,8 @@ public class DataAnalysisResp {
@Data
public static class ResourceDistCount{
private static final List<String> CITIES = List.of(
"北京", "上海", "广州", "深圳", "杭州",
"成都", "武汉", "西安", "长沙", "厦门"
"北京", "上海", "天津", "重庆",
"成都", "长沙"
);
/**
* 机器id

12
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/DataAnalysisService.java
View File

@ -7,19 +7,19 @@ import java.util.List;
public interface DataAnalysisService {
String getUseUserSUM();
String getUseUserSUM(String city);
String getTaskSUM();
String getTaskSUM(String city);
String getVulSUM();
String getVulSUM(String city);
DataAnalysisResp getUserAndTaskDataCount();
DataAnalysisResp getUserAndTaskDataCount(String city);
List<DataAnalysisResp.HoopVulCount> getHoopVulCountList();
List<DataAnalysisResp.ResourceDistCount> getResourceDistCountList();
List<DataAnalysisResp.ResourceDistCount> getResourceDistCountList(String city);
List<VulInfo> getVulMonitorCountList();
List<VulInfo> getVulMonitorCountList(String city);

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

@ -9,10 +9,14 @@ import cd.casic.framework.datapermission.core.dal.AdminUserMapper;
import cd.casic.module.machine.dal.dataobject.MachineInfoDO;
import cd.casic.module.machine.dal.mysql.MachineInfoMapper;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import java.util.List;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -35,50 +39,66 @@ public class DataAnalysisServiceImpl implements DataAnalysisService {
private MachineInfoMapper machineInfoMapper;
@Override
public String getUseUserSUM() {
public String getUseUserSUM(String city) {
return userMapper.selectCount().toString();
}
@Override
public String getTaskSUM() {
public String getTaskSUM(String city) {
return pipelineHisInstanceDao.selectCount().toString();
}
@Override
public String getVulSUM() {
return vulInfoDao.selectCount().toString();
public String getVulSUM(String city) {
return vulInfoDao.selectCount(new QueryWrapper<VulInfo>().lambda().eq(Objects.nonNull(city),VulInfo::getCity,city)).toString();
}
public String getPerilousVulSUM(){
return vulInfoDao.selectCount("severity", 2).toString();
public String getPerilousVulSUM(String city){
return vulInfoDao.selectCount(new LambdaQueryWrapper<VulInfo>().eq(Objects.nonNull(city),VulInfo::getCity,city).eq(VulInfo::getSeverity,2)).toString();
}
@Override
public DataAnalysisResp getUserAndTaskDataCount() {
return DataAnalysisResp.builder().scanVulSUM("101125698234").useUserSUM(getUseUserSUM())
.taskSUM(getTaskSUM()).vulSUM(getVulSUM()).perilousVulSUM(getPerilousVulSUM()).build();
public DataAnalysisResp getUserAndTaskDataCount(String city) {
return DataAnalysisResp.builder().scanVulSUM("101125698234").useUserSUM(getUseUserSUM(city))
.taskSUM(getTaskSUM(city)).vulSUM(getVulSUM(city)).perilousVulSUM(getPerilousVulSUM(city)).build();
}
@Override
public List<DataAnalysisResp.HoopVulCount> getHoopVulCountList() {
return null;
Integer integer = Integer.decode(getVulSUM(null));
if (integer == 0) {
return null;
}
QueryWrapper<VulInfo> wrapper = new QueryWrapper<>();
wrapper.select("city", "COUNT(*) as value")
.groupBy("city");
List<Map<String, Object>> listMaps = vulInfoDao.selectMaps(wrapper);
List<DataAnalysisResp.HoopVulCount> rest = new ArrayList<>();
listMaps.forEach(map -> {
DataAnalysisResp.HoopVulCount hoopVulCount = BeanUtil.mapToBean(map, DataAnalysisResp.HoopVulCount.class, false);
String format = new DecimalFormat("0.00%").format(hoopVulCount.getValue().divide(new BigDecimal(integer), 4, RoundingMode.HALF_UP));
hoopVulCount.setCount(format);
rest.add(hoopVulCount);
});
return rest;
}
@Override
public List<DataAnalysisResp.ResourceDistCount> getResourceDistCountList() {
public List<DataAnalysisResp.ResourceDistCount> getResourceDistCountList(String city) {
List<MachineInfoDO> machineInfoDOS = machineInfoMapper.selectList();
List<DataAnalysisResp.ResourceDistCount> distCountList = machineInfoDOS.stream().map(obj -> {
DataAnalysisResp.ResourceDistCount distCount = new DataAnalysisResp.ResourceDistCount();
BeanUtil.copyProperties(obj, distCount);
return distCount;
}).collect(Collectors.toList());
if (Objects.nonNull(city)) {
return distCountList.stream().filter(a -> city.equals(a.getCountry())).toList();
}
return distCountList;
}
@Override
public List<VulInfo> getVulMonitorCountList() {
return vulInfoDao.selectList();
public List<VulInfo> getVulMonitorCountList(String city) {
return vulInfoDao.selectList(new QueryWrapper<VulInfo>().lambda().eq(Objects.nonNull(city),VulInfo::getCity,city).orderByDesc(VulInfo::getCreateTime));
}
}