From 960125fd251b1fcba8a6c76c1e066b02c3cf9bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=B2=E5=85=88=E7=94=9F?= <821039958@qq.com>
Date: Wed, 30 Jul 2025 09:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E7=9B=91=E6=B5=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A6=82=E8=A7=88=20=E5=B7=B2=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../casic/ci/api/DataAnalysisController.java  |  3 +--
 .../resp/dataAnalysis/DataAnalysisResp.java   | 22 ++++++++++---------
 .../dataAnalysis/DataAnalysisService.java     |  3 +++
 .../Impl/DataAnalysisServiceImpl.java         |  6 +++++
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/DataAnalysisController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/DataAnalysisController.java
index 98654a70..9fb78101 100644
--- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/DataAnalysisController.java
+++ b/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();
+        return CommonResult.success(dataAnalysisService.getVulMonitorCountList());
     }
 
 
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 edbc0831..b5341cce 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
@@ -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{
-
-    }*/
-
 }
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/DataAnalysisService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/DataAnalysisService.java
index 8d56bb13..d1f179e0 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/DataAnalysisService.java
+++ b/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();
+
 
 
 
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 2f395108..0401031b 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
@@ -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();
+    }
 }