#2624

update

models/resource_queue.go

@@ -76,8 +76,10 @@ type ResourceQueueListRes struct {
 }
 
 type ResourceQueueCodesRes struct {
-	ID        int64
-	QueueCode string
+	ID           int64
+	QueueCode    string
+	Cluster      string
+	AiCenterCode string
 }
 
 func NewResourceQueueListRes(totalSize int64, list []ResourceQueue) *ResourceQueueListRes {

models/resource_specification.go

@@ -17,9 +17,9 @@ type ResourceSpecification struct {
 	SourceSpecId    string `xorm:"INDEX"`
 	AccCardsNum     int
 	CpuCores        int
-	MemMiB          int
-	GPUMemMiB       int
-	ShareMemMiB     int
+	MemGiB          float32
+	GPUMemGiB       float32
+	ShareMemGiB     float32
 	UnitPrice       int
 	Status          int
 	IsAutomaticSync bool
@@ -35,11 +35,12 @@ func (r ResourceSpecification) ConvertToRes() *ResourceSpecificationRes {
 		SourceSpecId: r.SourceSpecId,
 		AccCardsNum:  r.AccCardsNum,
 		CpuCores:     r.CpuCores,
-		MemMiB:       r.GPUMemMiB,
-		ShareMemMiB:  r.ShareMemMiB,
-		GPUMemMiB:    r.GPUMemMiB,
+		MemGiB:       r.GPUMemGiB,
+		ShareMemGiB:  r.ShareMemGiB,
+		GPUMemGiB:    r.GPUMemGiB,
 		UnitPrice:    r.UnitPrice,
 		Status:       r.Status,
+		UpdatedTime:  r.UpdatedTime,
 	}
 }
 
@@ -47,9 +48,9 @@ type ResourceSpecificationReq struct {
 	QueueId         int64 `binding:"Required"`
 	AccCardsNum     int
 	CpuCores        int
-	MemMiB          int
-	GPUMemMiB       int
-	ShareMemMiB     int
+	MemGiB          float32
+	GPUMemGiB       float32
+	ShareMemGiB     float32
 	UnitPrice       int
 	Status          int
 	IsAutomaticSync bool
@@ -61,9 +62,9 @@ func (r ResourceSpecificationReq) ToDTO() ResourceSpecification {
 		QueueId:         r.QueueId,
 		AccCardsNum:     r.AccCardsNum,
 		CpuCores:        r.CpuCores,
-		MemMiB:          r.MemMiB,
-		GPUMemMiB:       r.GPUMemMiB,
-		ShareMemMiB:     r.ShareMemMiB,
+		MemGiB:          r.MemGiB,
+		GPUMemGiB:       r.GPUMemGiB,
+		ShareMemGiB:     r.ShareMemGiB,
 		UnitPrice:       r.UnitPrice,
 		Status:          r.Status,
 		IsAutomaticSync: r.IsAutomaticSync,
@@ -99,11 +100,12 @@ type ResourceSpecificationRes struct {
 	SourceSpecId string
 	AccCardsNum  int
 	CpuCores     int
-	MemMiB       int
-	GPUMemMiB    int
-	ShareMemMiB  int
+	MemGiB       float32
+	GPUMemGiB    float32
+	ShareMemGiB  float32
 	UnitPrice    int
 	Status       int
+	UpdatedTime  timeutil.TimeStamp
 }
 
 type ResourceSpecAndQueueRes struct {