From 9489c7b552eafa1ac5c8d19bc27be6637b60f46f Mon Sep 17 00:00:00 2001 From: dushixiang Date: Mon, 15 Dec 2025 19:08:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/app.go | 1 - internal/handler/monitor_handler.go | 18 -------------- internal/service/monitor_service.go | 37 ----------------------------- 3 files changed, 56 deletions(-) diff --git a/internal/app.go b/internal/app.go index f0b5296..cfb6152 100644 --- a/internal/app.go +++ b/internal/app.go @@ -193,7 +193,6 @@ func setupApi(app *orz.App, components *AppComponents) { publicApiWithOptionalAuth.GET("/monitors/:id/stats", components.MonitorHandler.GetStatsByID) publicApiWithOptionalAuth.GET("/monitors/:id/agents", components.MonitorHandler.GetAgentStatsByID) publicApiWithOptionalAuth.GET("/monitors/:id/history", components.MonitorHandler.GetHistoryByID) - publicApiWithOptionalAuth.GET("/monitors/:id", components.MonitorHandler.GetDetail) // 整合版接口 // Logo(公开访问)- 用于公共页面只获取 Logo publicApiWithOptionalAuth.GET("/logo", components.PropertyHandler.GetLogo) diff --git a/internal/handler/monitor_handler.go b/internal/handler/monitor_handler.go index 6c1812c..f210f9b 100644 --- a/internal/handler/monitor_handler.go +++ b/internal/handler/monitor_handler.go @@ -160,24 +160,6 @@ func (h *MonitorHandler) GetStatsByID(c echo.Context) error { return orz.Ok(c, stats) } -// GetDetail 获取监控详情(整合版,公开接口,已登录返回全部,未登录返回公开可见) -func (h *MonitorHandler) GetDetail(c echo.Context) error { - id := c.Param("id") - ctx := c.Request().Context() - - // 验证监控任务访问权限 - if _, err := h.monitorService.GetMonitorByAuth(ctx, id, utils.IsAuthenticated(c)); err != nil { - return err - } - - detail, err := h.monitorService.GetMonitorDetail(ctx, id) - if err != nil { - return err - } - - return orz.Ok(c, detail) -} - // GetAgentStatsByID 获取指定监控任务各探针的统计数据(公开接口,已登录返回全部,未登录返回公开可见) func (h *MonitorHandler) GetAgentStatsByID(c echo.Context) error { id := c.Param("id") diff --git a/internal/service/monitor_service.go b/internal/service/monitor_service.go index e3a0f89..98de35b 100644 --- a/internal/service/monitor_service.go +++ b/internal/service/monitor_service.go @@ -404,43 +404,6 @@ func (s *MonitorService) GetMonitorStatsByID(ctx context.Context, monitorID stri return &overview, nil } -// GetMonitorDetail 获取监控详情(整合stats和agents) -func (s *MonitorService) GetMonitorDetail(ctx context.Context, monitorID string) (*metric.MonitorDetailResponse, error) { - // 查询监控任务 - monitor, err := s.MonitorRepo.FindById(ctx, monitorID) - if err != nil { - return nil, err - } - - // 查询聚合统计 - stats := s.metricService.GetMonitorStats(monitorID) - - // 查询各探针数据 - agents := s.metricService.GetMonitorAgentStats(monitorID) - - // 根据 ShowTargetPublic 字段决定是否返回真实的 Target - target := monitor.Target - if !monitor.ShowTargetPublic { - target = "******" - } - - // 构建响应 - detail := &metric.MonitorDetailResponse{ - ID: monitor.ID, - Name: monitor.Name, - Type: monitor.Type, - Target: target, - ShowTargetPublic: monitor.ShowTargetPublic, - Description: monitor.Description, - Enabled: monitor.Enabled, - Interval: monitor.Interval, - Stats: stats, - Agents: agents, - } - - return detail, nil -} - // GetMonitorHistory 获取监控任务的历史时序数据 // 直接返回 VictoriaMetrics 的原始时序数据,包含所有探针的独立序列 // 支持时间范围:15m, 30m, 1h, 3h, 6h, 12h, 1d, 3d, 7d