|
|
|
@@ -65,16 +65,18 @@ func NewResourceSceneListRes(totalSize int64, list []ResourceSceneRes) *Resource |
|
|
|
} |
|
|
|
|
|
|
|
type ResourceSceneRes struct { |
|
|
|
ID int64 |
|
|
|
SceneName string |
|
|
|
JobType JobType |
|
|
|
IsExclusive bool |
|
|
|
ExclusiveOrg string |
|
|
|
Cluster string |
|
|
|
AiCenterCode string |
|
|
|
QueueCode string |
|
|
|
AccCardType string |
|
|
|
Specs []ResourceSpecWithSceneId |
|
|
|
ID int64 |
|
|
|
SceneName string |
|
|
|
JobType JobType |
|
|
|
IsExclusive bool |
|
|
|
ExclusiveOrg string |
|
|
|
Cluster string |
|
|
|
AiCenterCode string |
|
|
|
QueueCode string |
|
|
|
QueueId int64 |
|
|
|
ComputeResource string |
|
|
|
AccCardType string |
|
|
|
Specs []ResourceSpecWithSceneId |
|
|
|
} |
|
|
|
|
|
|
|
func (ResourceSceneRes) TableName() string { |
|
|
|
@@ -253,7 +255,7 @@ func SearchResourceScene(opts SearchResourceSceneOptions) (int64, []ResourceScen |
|
|
|
} |
|
|
|
cols := []string{"resource_scene.id", "resource_scene.scene_name", "resource_scene.job_type", "resource_scene.is_exclusive", |
|
|
|
"resource_scene.exclusive_org", "resource_queue.cluster", "resource_queue.ai_center_code", "resource_queue.acc_card_type", |
|
|
|
"resource_queue.queue_code"} |
|
|
|
"resource_queue.id as queue_id", "resource_queue.compute_resource", "resource_queue.queue_code"} |
|
|
|
r := make([]ResourceSceneRes, 0) |
|
|
|
if err = x.Where(cond).Cols(cols...). |
|
|
|
Join("INNER", "resource_queue", "resource_queue.id = resource_scene.queue_id"). |
|
|
|
|