diff --git a/backend/controller/agent.go b/backend/controller/agent.go index 615e307..8970506 100644 --- a/backend/controller/agent.go +++ b/backend/controller/agent.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "log" "math" "net/http" "sort" @@ -289,7 +290,9 @@ func (h *AgentHandler) GetLatestReports(c *gin.Context) { threeMinAgo := time.Now().UTC().Add(-3 * time.Minute) // 以 servers 表为主,LEFT JOIN 最近 3 分钟内的 Agent 上报 // 未装 Agent 的主机也会显示(agent_status='not_installed'),打破"不显示→无法安装"的循环 - h.db.Raw(` + // 必须检查错误:此前未校验导致 asset_regions 表名错误被静默吞掉, + // 接口稳定返回空数组,表现为"资产有主机、大屏没主机"却无任何报错。 // Logan.Li + if err := h.db.Raw(` SELECT s.id as server_id, s.hostname, @@ -330,9 +333,14 @@ func (h *AgentHandler) GetLatestReports(c *gin.Context) { GROUP BY hostname ) ) a ON a.hostname = s.hostname - LEFT JOIN asset_regions r ON r.id = s.region_id + LEFT JOIN asset_cloud_regions r ON r.id = s.region_id ORDER BY a.report_time DESC, s.id ASC - `, threeMinAgo).Scan(&results) + `, threeMinAgo).Scan(&results).Error; err != nil { + log.Printf("[GetLatestReports] 查询主机最新上报失败: %v", err) + c.JSON(http.StatusInternalServerError, model.Response{ + Code: 500, Message: "查询主机列表失败: " + err.Error()}) + return + } if results == nil { results = []model.AgentLatestResponse{} diff --git a/backend/controller/agent_report_test.go b/backend/controller/agent_report_test.go index a3a5793..8143a5d 100644 --- a/backend/controller/agent_report_test.go +++ b/backend/controller/agent_report_test.go @@ -135,9 +135,8 @@ func TestGetLatestReportsUsesUTCTimeBoundary(t *testing.T) { if err := db.AutoMigrate(&model.Server{}, &model.AgentReport{}); err != nil { t.Fatalf("迁移测试表失败: %v", err) } - if err := db.Exec("CREATE TABLE asset_regions (id INTEGER PRIMARY KEY, name TEXT)").Error; err != nil { - t.Fatalf("创建区域测试表失败: %v", err) - } + // asset_cloud_regions 由上面的 AutoMigrate(&model.Server{}) 级联建立, + // 无需手工建表;此前手工建 asset_regions 反而掩盖了生产侧同名的错误 join。 // Logan.Li server := model.Server{ Hostname: "c-redis-cluster-3",