功能：完善云管助手与GPU故障恢复核对

platform/internal/server/diagnostics.go

@@ -63,6 +63,7 @@ type terminalLogArchive struct {
 	AgentVersion string    `json:"agentVersion" db:"agent_version"`
 	KioskState   string    `json:"kioskState" db:"kiosk_state"`
 	LogText      string    `json:"logText" db:"log_text"`
+	Source       string    `json:"source" db:"source"`
 }
 type terminalLogArchivePage struct {
 	Items         []terminalLogArchive `json:"items"`
@@ -87,13 +88,19 @@ func (s *Server) terminalLogArchives(c *gin.Context) {
 	page, size := pageParams(c)
 	args := []any{from, to, terminalID, keyword}
 	var total int
-	if err := s.DB.GetContext(c.Request.Context(), &total, `SELECT count(*) FROM terminal_log_archives WHERE captured_at>=$1 AND captured_at<=$2 AND ($3='' OR terminal_id=$3) AND ($4='' OR log_text ILIKE '%'||$4||'%')`, args...); err != nil {
+	if err := s.DB.GetContext(c.Request.Context(), &total, `SELECT count(*) FROM (
+ SELECT captured_at,terminal_id,log_text FROM terminal_log_archives
+ UNION ALL SELECT captured_at,terminal_id,message FROM terminal_log_entries
+ ) logs WHERE captured_at>=$1 AND captured_at<=$2 AND ($3='' OR terminal_id=$3) AND ($4='' OR log_text ILIKE '%'||$4||'%')`, args...); err != nil {
 		s.dbError(c, err)
 		return
 	}
 	items := []terminalLogArchive{}
 	args = append(args, size, (page-1)*size)
-	if err := s.DB.SelectContext(c.Request.Context(), &items, `SELECT a.id,a.task_id,a.terminal_id,t.name terminal_name,a.captured_at,a.boot_id,a.agent_version,a.kiosk_state,a.log_text FROM terminal_log_archives a JOIN terminals t ON t.id=a.terminal_id WHERE a.captured_at>=$1 AND a.captured_at<=$2 AND ($3='' OR a.terminal_id=$3) AND ($4='' OR a.log_text ILIKE '%'||$4||'%') ORDER BY a.captured_at DESC,a.id DESC LIMIT $5 OFFSET $6`, args...); err != nil {
+	if err := s.DB.SelectContext(c.Request.Context(), &items, `SELECT logs.id,logs.task_id,logs.terminal_id,t.name terminal_name,logs.captured_at,logs.boot_id,logs.agent_version,logs.kiosk_state,logs.log_text,logs.source FROM (
+ SELECT a.id,a.task_id,a.terminal_id,a.captured_at,a.boot_id,a.agent_version,a.kiosk_state,a.log_text,'snapshot' source FROM terminal_log_archives a
+ UNION ALL SELECT e.id,'' task_id,e.terminal_id,e.captured_at,e.boot_id,'' agent_version,e.level kiosk_state,e.message log_text,'stream' source FROM terminal_log_entries e
+ ) logs JOIN terminals t ON t.id=logs.terminal_id WHERE logs.captured_at>=$1 AND logs.captured_at<=$2 AND ($3='' OR logs.terminal_id=$3) AND ($4='' OR logs.log_text ILIKE '%'||$4||'%') ORDER BY logs.captured_at DESC,logs.id DESC LIMIT $5 OFFSET $6`, args...); err != nil {
 		s.dbError(c, err)
 		return
 	}