diff --git a/server/config/db.sql b/server/config/db.sql index 20b5801..268e0ba 100644 --- a/server/config/db.sql +++ b/server/config/db.sql @@ -17,4 +17,4 @@ create table nodes( update_time timestamp default current_timestamp on update current_timestamp ); -INSERT INTO hami.resource_pool (pool_name) VALUES ('大模型资源池'); +INSERT INTO hami.resource_pool (id, pool_name) VALUES (1, '大模型资源池'); diff --git a/server/internal/database/resource_pool_db.go b/server/internal/database/resource_pool_db.go index 6adebda..02380ce 100644 --- a/server/internal/database/resource_pool_db.go +++ b/server/internal/database/resource_pool_db.go @@ -58,7 +58,7 @@ func QueryResourcePoolById(poolId int64) (*ResourcePool, error) { func QueryResourcePoolListAll() ([]*ResourcePool, error) { // 执行查询 - rows, err := db.Query("SELECT id, pool_name, create_time, update_time FROM resource_pool order by id asc") + rows, err := db.Query("SELECT id, pool_name, create_time, update_time FROM resource_pool order by create_time desc") if err != nil { log.Infof("Query failed: %v", err) return nil, err diff --git a/server/internal/service/resource_pool.go b/server/internal/service/resource_pool.go index 6e9d19f..b2c3c78 100644 --- a/server/internal/service/resource_pool.go +++ b/server/internal/service/resource_pool.go @@ -127,6 +127,17 @@ func (s *ResourcePoolService) List(ctx context.Context, req *pb.ResourcePoolList return nil, errors.New("获取资源池列表失败") } + // Sort the resourcePoolList to put ID 1 first + sort.Slice(resourcePoolList, func(i, j int) bool { + if resourcePoolList[i].Id == 1 { + return true + } + if resourcePoolList[j].Id == 1 { + return false + } + return resourcePoolList[i].CreateTime.After(resourcePoolList[j].CreateTime) + }) + var data []*pb.ResourcePoolListData k8sNodes := s.getK8sNodes(ctx) for _, resourcePool := range resourcePoolList {