diff --git a/api/client/types.go b/api/client/types.go index ef6663aa..fe53fae5 100644 --- a/api/client/types.go +++ b/api/client/types.go @@ -156,21 +156,27 @@ type AiInfo struct { } type VmInfo struct { - TaskId int64 `json:"taskId,omitempty"` - Name string `json:"name,omitempty"` - AdapterId int64 `json:"adapterId,omitempty,optional"` - AdapterName string `json:"adapterName,omitempty,optional"` - ClusterId int64 `json:"clusterId,omitempty,optional"` - ClusterName string `json:"clusterName,omitempty,optional"` - FlavorRef string `json:"flavor_ref,omitempty"` - ImageRef string `json:"image_ref,omitempty"` - Uuid string `json:"uuid,omitempty"` - SourceType string `json:"source_type,omitempty"` - Status string `json:"status,omitempty"` - StartTime string `json:"startTime,omitempty"` - Platform string `json:"platform,omitempty"` - VmName string `json:"vm_name,omitempty"` - ServerId string `json:"server_id,omitempty"` + Id int64 `json:"id,omitempty"` + TaskId int64 `json:"taskId,omitempty"` + Name string `json:"name,omitempty"` + AdapterId int64 `json:"adapterId,omitempty,optional"` + AdapterName string `json:"adapterName,omitempty,optional"` + ClusterId int64 `json:"clusterId,omitempty,optional"` + ClusterName string `json:"clusterName,omitempty,optional"` + FlavorRef string `json:"flavor_ref,omitempty"` + ImageRef string `json:"image_ref,omitempty"` + Status string `json:"status,omitempty"` + Platform string `json:"platform,omitempty"` + Description string `json:"description,omitempty"` // 描述 + AvailabilityZone string `json:"availability_zone,omitempty"` + MinCount string `json:"min_count,omitempty"` + Uuid string `json:"uuid,omitempty"` + StartTime string `json:"startTime,omitempty"` + RunningTime string `json:"runningTime,omitempty"` + Result string `json:"result,omitempty"` + DeletedAt string `json:"deleted_at,omitempty"` + VmName string `json:"vm_name,omitempty"` + Replicas int64 `json:"replicas,omitempty"` } type ResourceStats struct { diff --git a/pkg/models/taskvmmodel_gen.go b/pkg/models/taskvmmodel_gen.go index fa749168..9389a2c8 100644 --- a/pkg/models/taskvmmodel_gen.go +++ b/pkg/models/taskvmmodel_gen.go @@ -37,7 +37,7 @@ type ( TaskVm struct { Id int64 `db:"id"` // id TaskId int64 `db:"task_id"` // 任务id - Name string `db:"name"` // 虚拟机名称 + Name string `db:"name"` // 任务名称 AdapterId int64 `db:"adapter_id"` // 执行任务的适配器id AdapterName string `db:"adapter_name"` // 适配器名称 ClusterId int64 `db:"cluster_id"` // 执行任务的集群id @@ -53,7 +53,10 @@ type ( StartTime string `db:"start_time"` // 开始时间 RunningTime string `db:"running_time"` // 运行时间 Result string `db:"result"` // 运行结果 + Remark string `db:"remark"` // 备注 DeletedAt string `db:"deleted_at"` // 删除时间 + VmName string `db:"vm_name"` // 虚拟机名称 + Replicas int64 `db:"replicas"` // 副本数 } ) @@ -92,14 +95,14 @@ func (m *defaultTaskVmModel) FindOne(ctx context.Context, id int64) (*TaskVm, er } func (m *defaultTaskVmModel) Insert(ctx context.Context, data *TaskVm) (sql.Result, error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, taskVmRowsExpectAutoSet) - ret, err := m.conn.ExecCtx(ctx, query, data.TaskId, data.Name, data.AdapterId, data.AdapterName, data.ClusterId, data.ClusterName, data.FlavorRef, data.ImageRef, data.Status, data.Platform, data.Description, data.AvailabilityZone, data.MinCount, data.Uuid, data.StartTime, data.RunningTime, data.Result, data.DeletedAt) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, taskVmRowsExpectAutoSet) + ret, err := m.conn.ExecCtx(ctx, query, data.TaskId, data.Name, data.AdapterId, data.AdapterName, data.ClusterId, data.ClusterName, data.FlavorRef, data.ImageRef, data.Status, data.Platform, data.Description, data.AvailabilityZone, data.MinCount, data.Uuid, data.StartTime, data.RunningTime, data.Result, data.Remark, data.DeletedAt, data.VmName, data.Replicas) return ret, err } func (m *defaultTaskVmModel) Update(ctx context.Context, data *TaskVm) error { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, taskVmRowsWithPlaceHolder) - _, err := m.conn.ExecCtx(ctx, query, data.TaskId, data.Name, data.AdapterId, data.AdapterName, data.ClusterId, data.ClusterName, data.FlavorRef, data.ImageRef, data.Status, data.Platform, data.Description, data.AvailabilityZone, data.MinCount, data.Uuid, data.StartTime, data.RunningTime, data.Result, data.DeletedAt, data.Id) + _, err := m.conn.ExecCtx(ctx, query, data.TaskId, data.Name, data.AdapterId, data.AdapterName, data.ClusterId, data.ClusterName, data.FlavorRef, data.ImageRef, data.Status, data.Platform, data.Description, data.AvailabilityZone, data.MinCount, data.Uuid, data.StartTime, data.RunningTime, data.Result, data.Remark, data.DeletedAt, data.VmName, data.Replicas, data.Id) return err }