Browse Source

#2624

add queue codes api
tags/v1.22.8.2^2
chenyifan01 3 years ago
parent
commit
d1ddad1ae4
4 changed files with 34 additions and 0 deletions
  1. +14
    -0
      models/resource_queue.go
  2. +10
    -0
      routers/admin/resources.go
  3. +1
    -0
      routers/routes/routes.go
  4. +9
    -0
      services/cloudbrain/resource/resource_queue.go

+ 14
- 0
models/resource_queue.go View File

@@ -75,6 +75,11 @@ type ResourceQueueListRes struct {
List []*ResourceQueueRes
}

type ResourceQueueCodesRes struct {
ID int64
QueueCode string
}

func NewResourceQueueListRes(totalSize int64, list []ResourceQueue) *ResourceQueueListRes {
resList := make([]*ResourceQueueRes, len(list))
for i, v := range list {
@@ -135,3 +140,12 @@ func SearchResourceQueue(opts SearchResourceQueueOptions) (int64, []ResourceQueu
}
return n, r, nil
}

func GetResourceQueueCodes() ([]*ResourceQueueCodesRes, error) {
r := make([]*ResourceQueueCodesRes, 0)
err := x.Table("resource_queue").Where("queue_code is not null AND queue_code != '' ").Find(&r)
if err != nil {
return nil, err
}
return r, nil
}

+ 10
- 0
routers/admin/resources.go View File

@@ -58,6 +58,16 @@ func GetResourceQueueList(ctx *context.Context) {
ctx.JSON(http.StatusOK, response.SuccessWithData(list))
}

func GetResourceQueueCodes(ctx *context.Context) {
list, err := resource.GetResourceQueueCodes()
if err != nil {
log.Error("GetResourceQueueCodes error.%v", err)
ctx.JSON(http.StatusOK, response.ServerError(err.Error()))
return
}
ctx.JSON(http.StatusOK, response.SuccessWithData(list))
}

func AddResourceQueue(ctx *context.Context, req models.ResourceQueueReq) {
req.IsAutomaticSync = false
req.CreatorId = ctx.User.ID


+ 1
- 0
routers/routes/routes.go View File

@@ -610,6 +610,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Group("/queue", func() {
m.Get("", admin.GetQueuePage)
m.Get("/list", admin.GetResourceQueueList)
m.Get("/codes", admin.GetResourceQueueCodes)
m.Post("/add", binding.Bind(models.ResourceQueueReq{}), admin.AddResourceQueue)
m.Post("/update/:id", binding.BindIgnErr(models.ResourceQueueReq{}), admin.UpdateResourceQueue)
})


+ 9
- 0
services/cloudbrain/resource/resource_queue.go View File

@@ -29,3 +29,12 @@ func GetResourceQueueList(opts models.SearchResourceQueueOptions) (*models.Resou

return models.NewResourceQueueListRes(n, r), nil
}

func GetResourceQueueCodes() ([]*models.ResourceQueueCodesRes, error) {
r, err := models.GetResourceQueueCodes()
if err != nil {
return nil, err
}

return r, nil
}

Loading…
Cancel
Save