Former-commit-id: e2d56722f5
pull/9/head
| @@ -271,10 +271,9 @@ type ( | |||||
| } | } | ||||
| ) | ) | ||||
| type ( | type ( | ||||
| listClusterReq { | listClusterReq { | ||||
| CenterId int32 `json:"centerId"` | |||||
| CenterId int32 `path:"centerId"` | |||||
| } | } | ||||
| listClusterResp { | listClusterResp { | ||||
| Code int32 `json:"code"` | Code int32 `json:"code"` | ||||
| @@ -34,7 +34,7 @@ service pcm { | |||||
| get /core/listCenter () returns (listCenterResp) | get /core/listCenter () returns (listCenterResp) | ||||
| @handler listClusterHandler | @handler listClusterHandler | ||||
| get /core/listCluster (listClusterReq) returns (listClusterResp) | |||||
| get /core/listCluster/:centerId (listClusterReq) returns (listClusterResp) | |||||
| @handler submitJobHandler | @handler submitJobHandler | ||||
| post /core/submitJob (submitJobReq) returns (submitJobResp) | post /core/submitJob (submitJobReq) returns (submitJobResp) | ||||
| @@ -39,7 +39,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { | |||||
| }, | }, | ||||
| { | { | ||||
| Method: http.MethodGet, | Method: http.MethodGet, | ||||
| Path: "/core/listCluster", | |||||
| Path: "/core/listCluster/:centerId", | |||||
| Handler: core.ListClusterHandler(serverCtx), | Handler: core.ListClusterHandler(serverCtx), | ||||
| }, | }, | ||||
| { | { | ||||
| @@ -30,8 +30,14 @@ func (l *ListClusterLogic) ListCluster(req *types.ListClusterReq) (*types.ListCl | |||||
| //var centersModel []model.ComputeCenter | //var centersModel []model.ComputeCenter | ||||
| var resp types.ListClusterResp | var resp types.ListClusterResp | ||||
| l.svcCtx.DbEngin.Raw("select * from compute_cluster").Scan(&clustersModel) | |||||
| l.svcCtx.DbEngin.Raw("select * from compute_cluster where center_id = ?", req.CenterId).Scan(&clustersModel) | |||||
| if clustersModel == nil { | |||||
| resp.Code = 200 | |||||
| resp.Msg = "success" | |||||
| resp.Data.TotalCount = 0 | |||||
| return &resp, nil | |||||
| } | |||||
| var clustersModelV = *clustersModel | var clustersModelV = *clustersModel | ||||
| for _, clusterModel := range clustersModelV { | for _, clusterModel := range clustersModelV { | ||||
| @@ -250,7 +250,7 @@ type Center struct { | |||||
| } | } | ||||
| type ListClusterReq struct { | type ListClusterReq struct { | ||||
| CenterId int32 `json:"centerId"` | |||||
| CenterId int32 `path:"centerId"` | |||||
| } | } | ||||
| type ListClusterResp struct { | type ListClusterResp struct { | ||||