From 7eb492d238a24d22668bba73ce9569e86cf5583f Mon Sep 17 00:00:00 2001 From: jagger Date: Tue, 29 Jul 2025 15:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=94=E9=82=A6=E5=AD=A6?= =?UTF-8?q?=E4=B9=A0=E5=BA=94=E7=94=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sdks/scheduler/app.go | 2 ++ sdks/scheduler/app_models.go | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sdks/scheduler/app.go b/sdks/scheduler/app.go index f491cae..0264384 100644 --- a/sdks/scheduler/app.go +++ b/sdks/scheduler/app.go @@ -37,6 +37,7 @@ type AppInstanceDao struct { AppRunRecords []AppRunRecordDao `gorm:"foreignKey:AppInstanceID;references:ID" json:"appRunRecords"` //运行记录 Status string `json:"status"` //应用状态 Role string `json:"role"` //应用角色 + JobSetID JobSetID `json:"jobSetID"` // 关联的作业集ID } func (AppInstanceDao) TableName() string { @@ -59,6 +60,7 @@ type AppInstance struct { AppRunRecords []AppRunRecordDao `gorm:"foreignKey:AppInstanceID;references:ID" json:"appRunRecords"` //运行记录 Status string `json:"status"` //应用状态 Role string `gorm:"-" json:"role"` //应用角色 + JobSetID JobSetID `gorm:"-" json:"jobSetID"` // 关联的作业集ID } type AppRunRecordDao struct { diff --git a/sdks/scheduler/app_models.go b/sdks/scheduler/app_models.go index ec27501..3fc1f6f 100644 --- a/sdks/scheduler/app_models.go +++ b/sdks/scheduler/app_models.go @@ -55,13 +55,18 @@ type FederatedLearningAppInfo struct { Name string `json:"name"` Description string `json:"description"` ClientCount int `json:"clientCount"` //参与者人数 - ServerJobInfo JobInfo `json:"serverJobInfo"` //服务端作业信息 - ClientJobInfo JobInfo `json:"clientJobInfo"` //客户端作业信息 + ServerJobInfo AIJobInfo `json:"serverJobInfo"` //服务端作业信息 + ClientJobInfo AIJobInfo `json:"clientJobInfo"` //客户端作业信息 Role string `json:"role"` //角色，server/client IsDataReturn bool `json:"isDataReturn"` //是否需要数据回源 DatasetBindID cdssdk.ObjectID `json:"datasetBindID"` //数据集绑定ID ClientIDs []ClientID `json:"clientIDs"` //参与者ID列表 JoinedCount int64 `json:"joinedCount"` //已经参与的人数 + + //用于回显数据 + ClientDatasets []interface{} `json:"clientDatasets"` //数据集列表 + ServerDataDistribute interface{} `json:"serverDataDistribute"` //server数据分发信息 + ClientDataDistribute interface{} `json:"clientDataDistribute"` //client数据分发信息 } type OtherAppInfo struct {