漏洞监测数据概览 已好

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

@@ -44,8 +44,7 @@ public class DataAnalysisController {
     @Operation(summary = "漏洞监测数据概览")
     @GetMapping("/VulMonitorDataList")
     public CommonResult VulMonitorDataList(@RequestParam(required = false,value = "country") String country){
-
+        return CommonResult.success(dataAnalysisService.getVulMonitorCountList());
-        return CommonResult.success();
     }
 
 

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

@@ -1,6 +1,7 @@
 package cd.casic.ci.process.dto.resp.dataAnalysis;
 
 import cd.casic.ci.process.enums.MachineSystemEnum;
+import cd.casic.ci.process.process.dataObject.volumnInfo.VulInfo;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Builder;
@@ -40,12 +41,21 @@ public class DataAnalysisResp {
      */
     private String perilousVulSUM;
 
-
+    /**
+     * 漏洞监测分布概览
+     */
     private List<HoopVulCount> hoopVulCountList;
 
-
+    /**
+     * 资源分配数据概览
+     */
     private List<ResourceDistCount> resourceDistCountList;
 
+    /**
+     * 漏洞监测数据概览
+     */
+    private List<VulInfo> VulMonitorCountList;
+
 
     /**
      * 漏洞监测分布概览
@@ -104,12 +114,4 @@ public class DataAnalysisResp {
        }
    }
 
-    /**
-     *
-     */
-    /*@Data
-    static class VulMonitorCount{
-
-    }*/
-
 }

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

@@ -1,6 +1,7 @@
 package cd.casic.ci.process.process.service.dataAnalysis;
 
 import cd.casic.ci.process.dto.resp.dataAnalysis.DataAnalysisResp;
+import cd.casic.ci.process.process.dataObject.volumnInfo.VulInfo;
 
 import java.util.List;
 
@@ -18,6 +19,8 @@ public interface DataAnalysisService {
 
     List<DataAnalysisResp.ResourceDistCount> getResourceDistCountList();
 
+    List<VulInfo> getVulMonitorCountList();
+
 
 
 

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

@@ -3,6 +3,7 @@ package cd.casic.ci.process.process.service.dataAnalysis.Impl;
 import cd.casic.ci.process.dto.resp.dataAnalysis.DataAnalysisResp;
 import cd.casic.ci.process.process.dao.history.PipPipelineHisInstanceDao;
 import cd.casic.ci.process.process.dao.vulInfo.VulInfoDao;
+import cd.casic.ci.process.process.dataObject.volumnInfo.VulInfo;
 import cd.casic.ci.process.process.service.dataAnalysis.DataAnalysisService;
 import cd.casic.framework.datapermission.core.dal.AdminUserMapper;
 import cd.casic.module.machine.dal.dataobject.MachineInfoDO;
@@ -75,4 +76,9 @@ public class DataAnalysisServiceImpl implements DataAnalysisService {
         }).collect(Collectors.toList());
         return distCountList;
     }
+
+    @Override
+    public List<VulInfo> getVulMonitorCountList() {
+        return vulInfoDao.selectList();
+    }
 }