From f903c085b8adde79c3aeca453a9b935adb1ef033 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 26 十月 2019 14:16:58 +0800
Subject: [PATCH] fix uout
---
controllers/task.go | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/controllers/task.go b/controllers/task.go
index 5e233ec..8e5ff47 100644
--- a/controllers/task.go
+++ b/controllers/task.go
@@ -73,7 +73,7 @@
// @Param reqMap body controllers.TaskVo false "浠诲姟AAA"
// @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/add [POST]
+// @Router /data/api-v/task/addTask [POST]
func (tc TaskController) AddTask(c *gin.Context) {
var task TaskVo
var taskApi dbapi.TaskApi
@@ -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)
}
}
@@ -127,8 +130,8 @@
// @Description 鏍规嵁taskid鍜宻dkid鍒犻櫎
// @Produce json
// @Tags task
-// @Param taskId path string true "浠诲姟id"
-// @Param sdkId path string true "绠楁硶id"
+// @Param taskId query string true "浠诲姟id"
+// @Param sdkId query string 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/delTaskSdk [GET]
@@ -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)
}
}
@@ -152,8 +155,8 @@
// @Description 鏇存柊浠诲姟鍚嶇О
// @Produce json
// @Tags task
-// @Param taskId query string true "taskId"
-// @Param taskName query string true "taskName"
+// @Param taskId formData string true "taskId"
+// @Param taskName formData string true "taskName"
// @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/updateTaskName [POST]
@@ -208,7 +211,7 @@
// @Description 鏍规嵁浠诲姟id鍒犻櫎浠诲姟
// @Produce json
// @Tags task
-// @Param taskId path string true "浠诲姟id"
+// @Param taskId query string 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/delete [GET]
@@ -253,7 +256,7 @@
func (tc TaskController) SaveTaskSdkRule(c *gin.Context) {
var rules TaskSdkRules
err := c.BindJSON(&rules)
- if err !=nil {
+ if err !=nil || rules.TaskId == "" || rules.SdkId == "" || len(rules.Rules) == 0 {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
@@ -271,18 +274,20 @@
// @Description 鍒犻櫎绠楁硶瑙勫垯
// @Produce json
// @Tags 绠楁硶瑙勫垯
-// @Param id query string true "id"
+// @Param taskId formData string true "taskId"
+// @Param sdkId formData string true "sdkId"
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
-// @Router /data/api-v/task/deleteTaskSdkRuleById [post]
-func (tc TaskController) DeleteTaskSdkRuleById(c *gin.Context) {
- id := c.PostForm("id")
- if id == "" {
+// @Router /data/api-v/task/deleteTaskSdkRule [post]
+func (tc TaskController) DeleteTaskSdkRule(c *gin.Context) {
+ taskId := c.PostForm("taskId")
+ sdkId := c.PostForm("sdkId")
+ if taskId == "" || sdkId == "" {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
var api dbapi.TaskSdkRuleApi
- if api.DeleteTaskSdkRuleById(id) {
+ if api.DeleteTaskSdkRule(taskId, sdkId) {
util.ResponseFormat(c,code.Success,"鍒犻櫎鎴愬姛")
} else {
util.ResponseFormat(c,code.ComError, "鍒犻櫎澶辫触")
@@ -294,8 +299,8 @@
// @Description 鏌ヨ绠楁硶瑙勫垯
// @Produce json
// @Tags 绠楁硶瑙勫垯
-// @Param taskId path string true "浠诲姟id"
-// @Param sdkId path string true "绠楁硶id"
+// @Param taskId query string true "浠诲姟id"
+// @Param sdkId query string true "绠楁硶id"
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
// @Router /data/api-v/task/getRulesByTaskSdk [get]
--
Gitblit v1.8.0