master
luziqi 3 years ago
parent 995283a2e6
commit 160e1a51fc

@ -72,6 +72,7 @@ func main() {
r.PUT("/webdav/monkey/task/:id/:filename", monkey.TaskReport) r.PUT("/webdav/monkey/task/:id/:filename", monkey.TaskReport)
// monkey v2 // monkey v2
r.POST("/api/monkey/v2/create_task", monkey.CreateTaskV2) r.POST("/api/monkey/v2/create_task", monkey.CreateTaskV2)
r.POST("/api/monkey/v2/task/handle/set", monkey.UpdateHandleStatus)
// device // device
r.GET("/api/device/v1/list", device.GetDevices) r.GET("/api/device/v1/list", device.GetDevices)

@ -111,6 +111,46 @@ func CreateTaskV2(c *gin.Context) {
// go RunAndroidMonkeyCmd(task, device.Udid) // go RunAndroidMonkeyCmd(task, device.Udid)
} }
// @Tags Monkey相关 /api/monkey/v2/
// @Summary 更新任务跟进状态
// @Description 更新Monkey任务跟进状态
// @accept x-www-form-urlencoded
// @Param task_id formData string true "Monkey任务id"
// @Param handle_status formData string true "跟进情况IN_PROGRESS-跟进中/DONE-已跟进"
// @Success 200 {object} models.Response "返回创建后的设备信息"
// @Router /api/monkey/v2/task/handle/set [post]
func UpdateHandleStatus(c *gin.Context) {
rsp := controllers.NewResponse()
task_id := cast.ToInt(c.PostForm("task_id"))
handle_status := c.PostForm("handle_status")
if task_id < 1 {
c.JSON(http.StatusOK, rsp.Error("参数task_id错误"+c.PostForm("task_id")))
return
}
if handle_status == "" {
c.JSON(http.StatusOK, rsp.Error("参数handle_status错误"+c.PostForm("handle_status")))
return
}
db, err := dbsql.GetConn(dbsql.DSN)
if err != nil {
c.JSON(http.StatusOK, rsp.Error(err.Error()))
return
}
defer dbsql.Close(db)
task, err := getTaskById(task_id, db)
if err != nil {
c.JSON(http.StatusOK, rsp.Error(err.Error()))
return
}
db.Model(models.MonkeyTask{}).Where("id = ?", task.Id).Update("handle_status", handle_status)
// 还没写
c.JSON(http.StatusOK, rsp.Success())
}
// 根据id查询monkey任务信息db传nil时会另外新建数据库链接 // 根据id查询monkey任务信息db传nil时会另外新建数据库链接
func getTaskById(id int, db *gorm.DB) (models.MonkeyTask, error) { func getTaskById(id int, db *gorm.DB) (models.MonkeyTask, error) {
var task models.MonkeyTask var task models.MonkeyTask

@ -9,12 +9,13 @@ import (
) )
type Voice struct { type Voice struct {
ID int `json:"id" gorm:"primary_key"` ID int `json:"id" gorm:"primary_key"`
FormID string `json:"form_id" gorm:"column:form_id"` FormID string `json:"form_id" gorm:"column:form_id"`
GroupID int `json:"group_id" gorm:"column:group_id"` GroupID int `json:"group_id" gorm:"column:group_id"`
Filename string `json:"filename" gorm:"column:filename"` GroupName string `json:"group_name" gorm:"column:group_name"`
FileURL string `json:"file_url" gorm:"column:file_url"` Filename string `json:"filename" gorm:"column:filename"`
IsDel int `json:"-" gorm:"column:is_del"` FileURL string `json:"file_url" gorm:"column:file_url"`
IsDel int `json:"-" gorm:"column:is_del"`
} }
func (t *Voice) TableName() string { func (t *Voice) TableName() string {
@ -23,6 +24,7 @@ func (t *Voice) TableName() string {
type VoiceGroup struct { type VoiceGroup struct {
ID int `json:"id" gorm:"primary_key"` ID int `json:"id" gorm:"primary_key"`
Name string `json:"name"`
List []Voice `json:"list"` List []Voice `json:"list"`
} }
@ -65,6 +67,7 @@ func GetVoiceTestData(c *gin.Context) {
} else { } else {
var _group VoiceGroup var _group VoiceGroup
_group.ID = v.GroupID _group.ID = v.GroupID
_group.Name = v.GroupName
_group.List = append(_group.List, v) _group.List = append(_group.List, v)
m[v.GroupID] = _group m[v.GroupID] = _group
} }

Loading…
Cancel
Save