Merge pull request #73 from JaD1ng/develop

refactor(service_manager): 根据会议内容调整健康状态模型并更新相关代码

Author: LiusCraft

docs/service_manager/model/schema.sql

@@ -34,11 +34,9 @@ CREATE TABLE IF NOT EXISTS service_instances (
 CREATE TABLE IF NOT EXISTS service_states (
     service VARCHAR(255),
     version VARCHAR(255),
-    level VARCHAR(50),
-    detail TEXT,
     report_at TIMESTAMP,
     resolved_at TIMESTAMP,
-    health_status VARCHAR(50),
+    health_state VARCHAR(50),
     correlation_id VARCHAR(255),
     PRIMARY KEY (service, version),
     FOREIGN KEY (service) REFERENCES services(name) ON DELETE CASCADE

internal/service_manager/database/info_repo.go

@@ -155,13 +155,13 @@ func (d *Database) CreateServiceInstance(ctx context.Context, instance *model.Se
 
 // GetServiceState 获取服务状态
 func (d *Database) GetServiceState(ctx context.Context, serviceName string) (*model.ServiceState, error) {
-	query := `SELECT service, version, level, detail, report_at, resolved_at, health_status, correlation_id 
+	query := `SELECT service, version, report_at, resolved_at, health_state, correlation_id
 	          FROM service_states WHERE service = $1 ORDER BY report_at DESC LIMIT 1`
 	row := d.QueryRowContext(ctx, query, serviceName)
 
 	var state model.ServiceState
-	if err := row.Scan(&state.Service, &state.Version, &state.Level, &state.Detail, &state.ReportAt,
-		&state.ResolvedAt, &state.HealthStatus, &state.CorrelationID); err != nil {
+	if err := row.Scan(&state.Service, &state.Version, &state.ReportAt,
+		&state.ResolvedAt, &state.HealthState, &state.CorrelationID); err != nil {
 		if err == sql.ErrNoRows {
 			return nil, nil
 		}

internal/service_manager/model/api.go

@@ -6,10 +6,10 @@ import "time"
 
 // ServiceItem API响应用的服务信息（对应/v1/services接口items格式）
 type ServiceItem struct {
-	Name        string       `json:"name"`        // 服务名称
-	DeployState DeployStatus `json:"deployState"` // 发布状态：InDeploying|AllDeployFinish
-	Health      HealthLevel  `json:"health"`      // 健康状态：Normal/Warning/Error
-	Deps        []string     `json:"deps"`        // 依赖关系（直接使用Service.Deps）
+	Name        string      `json:"name"`        // 服务名称
+	DeployState DeployState `json:"deployState"` // 发布状态
+	Health      HealthState `json:"health"`      // 健康状态：Normal/Warning/Error
+	Deps        []string    `json:"deps"`        // 依赖关系（直接使用Service.Deps）
 }
 
 // ServicesResponse 服务列表API响应（对应/v1/services接口）
@@ -25,7 +25,7 @@ type ActiveVersionItem struct {
 	StartTime               time.Time   `json:"startTime"`               // 开始时间
 	EstimatedCompletionTime time.Time   `json:"estimatedCompletionTime"` // 预估完成时间
 	Instances               int         `json:"instances"`               // 实例个数
-	Health                  HealthLevel `json:"health"`                  // 健康状态：Normal/Warning/Error
+	Health                  HealthState `json:"health"`                  // 健康状态：Normal/Warning/Error
 }
 
 // PrometheusQueryRangeResponse Prometheus query_range接口响应格式

internal/service_manager/model/constants.go

@@ -1,38 +1,12 @@
 package model
 
-// Status 异常处理状态枚举
-type Status string
+// HealthState 健康状态枚举
+type HealthState string
 
 const (
-	StatusNew        Status = "new"
-	StatusAnalyzing  Status = "analyzing"
-	StatusProcessing Status = "processing"
-	StatusResolved   Status = "resolved"
-)
-
-// Level 健康状态枚举
-type Level string
-
-const (
-	LevelWarning Level = "Warning"
-	LevelError   Level = "Error"
-)
-
-// HealthLevel API响应用的健康状态枚举（包含正常状态）
-type HealthLevel string
-
-const (
-	HealthLevelNormal  HealthLevel = "Normal"
-	HealthLevelWarning HealthLevel = "Warning"
-	HealthLevelError   HealthLevel = "Error"
-)
-
-// DeployStatus 部署状态枚举
-type DeployStatus string
-
-const (
-	DeployStatusInDeploying     DeployStatus = "InDeploying"
-	DeployStatusAllDeployFinish DeployStatus = "AllDeployFinish"
+	HealthStateNormal  HealthState = "Normal"
+	HealthStateWarning HealthState = "Warning"
+	HealthStateError   HealthState = "Error"
 )
 
 // DeployState 发布状态枚举

internal/service_manager/model/service_state.go

@@ -4,12 +4,10 @@ import "time"
 
 // ServiceState 服务状态信息
 type ServiceState struct {
-	Service       string     `json:"service" db:"service"`              // varchar(255) - 联合PK
-	Version       string     `json:"version" db:"version"`              // varchar(255) - 联合PK
-	Level         Level      `json:"level" db:"level"`                  // 异常级别
-	Detail        string     `json:"detail" db:"detail"`                // text - 详细信息
-	ReportAt      time.Time  `json:"reportAt" db:"report_at"`           // time - 报告时间
-	ResolvedAt    *time.Time `json:"resolvedAt" db:"resolved_at"`       // time - 解决时间
-	HealthStatus  Status     `json:"healthStatus" db:"health_status"`   // 健康状态
-	CorrelationID string     `json:"correlationId" db:"correlation_id"` // varchar - 关联ID
+	Service       string      `json:"service" db:"service"`              // varchar(255) - 联合PK
+	Version       string      `json:"version" db:"version"`              // varchar(255) - 联合PK
+	ReportAt      time.Time   `json:"reportAt" db:"report_at"`           // time - 报告时间
+	ResolvedAt    *time.Time  `json:"resolvedAt" db:"resolved_at"`       // time - 解决时间
+	HealthState   HealthState `json:"healthState" db:"health_state"`     // 健康状态
+	CorrelationID string      `json:"correlationId" db:"correlation_id"` // varchar - 关联ID
 }

internal/service_manager/service/info_service.go

@@ -27,19 +27,13 @@ func (s *Service) GetServicesResponse(ctx context.Context) (*model.ServicesRespo
 		}
 
 		// 默认为正常状态，因为正常状态的服务不会存储在service_state表中
-		health := model.HealthLevelNormal
+		health := model.HealthStateNormal
 		if state != nil {
-			// 将数据库中的异常状态映射为API响应状态
-			switch state.Level {
-			case model.LevelWarning:
-				health = model.HealthLevelWarning
-			case model.LevelError:
-				health = model.HealthLevelError
-			}
+			health = state.HealthState
 		}
 
 		// 默认设置为已完成部署状态
-		deployState := model.DeployStatusAllDeployFinish
+		deployState := model.StatusCompleted
 
 		items[i] = model.ServiceItem{
 			Name:        service.Name,
@@ -82,16 +76,10 @@ func (s *Service) GetServiceActiveVersions(ctx context.Context, serviceName stri
 		}
 
 		// 默认为正常状态，因为正常状态的服务不会存储在service_state表中
-		health := model.HealthLevelNormal
+		health := model.HealthStateNormal
 		reportAt := &model.ServiceState{}
 		if state != nil {
-			// 将数据库中的异常状态映射为API响应状态
-			switch state.Level {
-			case model.LevelWarning:
-				health = model.HealthLevelWarning
-			case model.LevelError:
-				health = model.HealthLevelError
-			}
+			health = state.HealthState
 			reportAt = state
 		}