From 7a25d74ac84381d374d09a0bb756bc8e22ac1446 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期一, 05 八月 2019 14:06:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/task.go | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/controllers/task.go b/controllers/task.go
index 5e233ec..8366edc 100644
--- a/controllers/task.go
+++ b/controllers/task.go
@@ -94,6 +94,9 @@
type TaskSdkAdd struct {
TaskId string `json:"taskId"`
+ Sdks []SdkSort `json:"sdks"`
+}
+type SdkSort struct {
SdkId string `json:"sdkId"`
Sort int `json:"sort"`
}
@@ -102,24 +105,24 @@
// @Description 浠诲姟娣诲姞绠楁硶
// @Produce json
// @Tags task
-// @Param taskId query string true "浠诲姟id"
-// @Param sdkId query string true "绠楁硶id"
+// @Param taskSdkAdd body controllers.TaskSdkAdd true "浠诲姟id"
// @Success 200 {string} json "{"code":200, msg:"璇锋眰澶勭悊鎴愬姛",data:"",success:true}"
// @Failure 500 {string} json "{"code":500, msg:"璇锋眰澶辫触",data:"",success:false}"
// @Router /data/api-v/task/addTaskSdk [post]
func (tc TaskController) AddTaskSdk(c *gin.Context) {
var addVo TaskSdkAdd
err := c.BindJSON(&addVo)
- if err !=nil || addVo.TaskId == "" || addVo.SdkId == "" {
+ if err !=nil || addVo.TaskId == "" || len(addVo.Sdks)==0 {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
+ paramBody := util.Struct2Map(addVo)
var taskApi dbapi.TaskApi
- flag,data := taskApi.AddTaskSdk(addVo.TaskId, addVo.SdkId, addVo.Sort)
+ flag,data := taskApi.AddTaskSdk(paramBody)
if flag {
- util.ResponseFormat(c, code.ComError, data)
+ util.ResponseFormat(c, code.Success, data)
} else {
- util.ResponseFormat(c,code.Success,data)
+ util.ResponseFormat(c,code.ComError,data)
}
}
@@ -142,9 +145,9 @@
}
flag,data := taskApi.DeleteTaskSdk(taskId,sdkId)
if flag {
- util.ResponseFormat(c, code.ComError, data)
+ util.ResponseFormat(c, code.Success, data)
} else {
- util.ResponseFormat(c,code.Success,data)
+ util.ResponseFormat(c,code.ComError, data)
}
}
--
Gitblit v1.8.0