luziqi
/
autogo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 支持更多筛选参数

Browse Source
master
luziqi 3 years ago
parent 59fad13891
commit 4c48e3ef4e
4 changed files with 173 additions and 5 deletions
Show Stats Download Patch File Download Diff File

55
docs/docs.go
Unescape Escape View File

@ -375,6 +375,35 @@ const docTemplate = `{
}
}
},
"/api/device/v2/list": {
"get": {
"description": "获取设备列表，可选筛选系统平台",
"consumes": [
"application/x-www-form-urlencoded"
],
"tags": [
"设备相关 /api/device/v2/"
],
"summary": "获取设备列表",
"parameters": [
{
"type": "string",
"description": "系统平台，不传查全部",
"name": "pf",
"in": "query",
"required": true
}
],
"responses": {
"200": {
"description": "返回设备列表",
"schema": {
"$ref": "#/definitions/models.Response"
}
}
}
}
},
"/api/device/v2/update_ip": {
"post": {
"description": "更新设备IP",
@ -953,16 +982,40 @@ const docTemplate = `{
"in": "query"
},
{
"type": "integer",
"type": "string",
"description": "项目名称",
"name": "project",
"in": "query"
},
{
"type": "string",
"description": "产品名称",
"name": "product",
"in": "query"
},
{
"type": "string",
"description": "版本号，模糊匹配",
"name": "version",
"in": "query"
},
{
"type": "string",
"description": "系统平台:ios/adr",
"name": "pf",
"in": "query"
},
{
"type": "integer",
"description": "传1筛选有异常的任务",
"name": "has_error",
"in": "query"
},
{
"type": "string",
"description": "任务状态(大写)",
"name": "status",
"in": "query"
}
],
"responses": {

55
docs/swagger.json
Unescape Escape View File

@ -363,6 +363,35 @@
}
}
},
"/api/device/v2/list": {
"get": {
"description": "获取设备列表，可选筛选系统平台",
"consumes": [
"application/x-www-form-urlencoded"
],
"tags": [
"设备相关 /api/device/v2/"
],
"summary": "获取设备列表",
"parameters": [
{
"type": "string",
"description": "系统平台，不传查全部",
"name": "pf",
"in": "query",
"required": true
}
],
"responses": {
"200": {
"description": "返回设备列表",
"schema": {
"$ref": "#/definitions/models.Response"
}
}
}
}
},
"/api/device/v2/update_ip": {
"post": {
"description": "更新设备IP",
@ -941,16 +970,40 @@
"in": "query"
},
{
"type": "integer",
"type": "string",
"description": "项目名称",
"name": "project",
"in": "query"
},
{
"type": "string",
"description": "产品名称",
"name": "product",
"in": "query"
},
{
"type": "string",
"description": "版本号，模糊匹配",
"name": "version",
"in": "query"
},
{
"type": "string",
"description": "系统平台:ios/adr",
"name": "pf",
"in": "query"
},
{
"type": "integer",
"description": "传1筛选有异常的任务",
"name": "has_error",
"in": "query"
},
{
"type": "string",
"description": "任务状态(大写)",
"name": "status",
"in": "query"
}
],
"responses": {

37
docs/swagger.yaml
Unescape Escape View File

@ -282,6 +282,25 @@ paths:
summary: 查询设备
tags:
- 设备相关 /api/device/v2/
/api/device/v2/list:
get:
consumes:
- application/x-www-form-urlencoded
description: 获取设备列表，可选筛选系统平台
parameters:
- description: 系统平台，不传查全部
in: query
name: pf
required: true
type: string
responses:
"200":
description: 返回设备列表
schema:
$ref: '#/definitions/models.Response'
summary: 获取设备列表
tags:
- 设备相关 /api/device/v2/
/api/device/v2/update_ip:
post:
consumes:
@ -665,11 +684,27 @@ paths:
- description: 项目名称
in: query
name: project
type: integer
type: string
- description: 产品名称
in: query
name: product
type: string
- description: 版本号，模糊匹配
in: query
name: version
type: string
- description: 系统平台:ios/adr
in: query
name: pf
type: string
- description: 传1筛选有异常的任务
in: query
name: has_error
type: integer
- description: 任务状态(大写)
in: query
name: status
type: string
responses:
"200":
description: 返回更新后的任务信息

31
monkey/task.go
Unescape Escape View File

@ -194,8 +194,12 @@ func UpdateTaskCrashCount(c *gin.Context) {
// @accept x-www-form-urlencoded
// @Param page_size query int false "每页大小,默认为10"
// @Param page_index query int false "第几页，默认为第一页"
// @Param project query int false "项目名称"
// @Param project query string false "项目名称"
// @Param product query string false "产品名称"
// @Param version query string false "版本号，模糊匹配"
// @Param pf query string false "系统平台:ios/adr"
// @Param has_error query int false "传1筛选有异常的任务"
// @Param status query string false "任务状态(大写)"
// @Success 200 {object} models.Response "返回更新后的任务信息"
// @Router /api/monkey/v1/tasks [get]
func GetTasks(c *gin.Context) {
@ -215,9 +219,18 @@ func GetTasks(c *gin.Context) {
}
p.Size = pageSize
// param-项目
project := c.DefaultQuery("project", "")
// param-系统平台
pf := c.DefaultQuery("pf", "")
if pf != "" && pf != "adr" && pf != "ios" {
c.JSON(http.StatusOK, rsp.Error("参数pf异常"))
return
}
// param-是否有异常
has_error := cast.ToInt(c.DefaultQuery("has_error", "0"))
// param-任务状态
status := c.DefaultQuery("status", "")
db, err := dbsql.GetConn(dbsql.DSN)
if err != nil {
@ -230,12 +243,26 @@ func GetTasks(c *gin.Context) {
db = db.Model(&models.MonkeyTask{})
var lenght int64
// 参数判断
if project != "" {
db = db.Where("project = ?", project)
}
if c.Query("product") != "" {
db = db.Where("product = ?", c.Query("product"))
}
if c.Query("version") != "" {
db = db.Where("version LIKE ?", "%"+c.Query("version")+"%")
}
if pf != "" {
db = db.Where("platform = ?", pf)
}
if has_error == 1 {
db = db.Where("crash_count > 0")
}
if status != "" {
db = db.Where("status = ?", status)
}
db = db.Where("is_del = 0").Count(&lenght)
db = dbsql.SetPageQuery(db, pageIndex, pageSize)
db.Order("id desc").Find(&list)

Write Preview
Loading…
Cancel
Save