From 82dbe4f260c4364d5dc7677ef3bb0c4da39789ce Mon Sep 17 00:00:00 2001 From: JeshuaRen <270813223@qq.com> Date: Mon, 10 Feb 2025 16:13:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sdks/pcmscheduler/access.go | 7 +++++++ sdks/pcmscheduler/jobset.go | 14 ++++++++++++-- sdks/uploader/models.go | 4 ++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/sdks/pcmscheduler/access.go b/sdks/pcmscheduler/access.go index fa0c296..8376b48 100644 --- a/sdks/pcmscheduler/access.go +++ b/sdks/pcmscheduler/access.go @@ -39,3 +39,10 @@ type AccessLog struct { AccessTime time.Time `gorm:"column:access_time" json:"accessTime"` AccessType string `gorm:"column:access_type" json:"accessType"` } + +type User struct { + ID int64 `gorm:"column:id" json:"id"` + SsoID string `gorm:"column:sso_id" json:"ssoID"` + UserName string `gorm:"column:username" json:"userName"` + Created time.Time `gorm:"column:created_at" json:"created"` +} diff --git a/sdks/pcmscheduler/jobset.go b/sdks/pcmscheduler/jobset.go index 0248ff0..584561f 100644 --- a/sdks/pcmscheduler/jobset.go +++ b/sdks/pcmscheduler/jobset.go @@ -25,7 +25,8 @@ func (c *Client) GetClusterInfo(req GetClusterInfoReq) ([]ClusterDetail, error) return nil, err } - resp, err := http2.PostJSON(targetUrl, http2.RequestParam{Body: req}) + //resp, err := http2.PostJSON(targetUrl, http2.RequestParam{Body: req}) + resp, err := http2.PostJSON(targetUrl, http2.RequestParam{}) if err != nil { return nil, err } @@ -37,8 +38,17 @@ func (c *Client) GetClusterInfo(req GetClusterInfoReq) ([]ClusterDetail, error) return nil, fmt.Errorf("parsing response: %w", err) } + // 该接口传入参数后查询效率很低,所以需要在这里特殊处理 if codeResp.Code == ResponseCodeOK { - return codeResp.Data, nil + var results []ClusterDetail + for _, cluster := range codeResp.Data { + for _, id := range req.IDs { + if cluster.ClusterId == id { + results = append(results, cluster) + } + } + } + return results, nil } return nil, codeResp.ToError() diff --git a/sdks/uploader/models.go b/sdks/uploader/models.go index 82c7ee1..cb5b77f 100644 --- a/sdks/uploader/models.go +++ b/sdks/uploader/models.go @@ -37,6 +37,8 @@ type Binding struct { type BindingAccessData struct { ID DataID `gorm:"column:id;primaryKey;autoIncrement" json:"ID"` UserID cdssdk.UserID `gorm:"column:user_id" json:"userID"` + UserName string `gorm:"column:username" json:"userName"` + SSOId string `gorm:"column:sso_id" json:"ssoID"` Name string `gorm:"column:name" json:"Name"` DataType string `gorm:"column:data_type" json:"dataType"` Content string `gorm:"column:content" json:"Content"` @@ -48,6 +50,8 @@ type BindingAccessData struct { type BindingDetail struct { ID DataID `json:"ID"` UserID cdssdk.UserID `json:"ownerID"` + UserName string `json:"userName"` + SSOId string `json:"ssoID"` Name string `json:"Name"` Info sch.DataBinding `json:"info"` Packages []Package `json:"packages"`