From 000e51f17eba47c3502ee8f717f53f1fae3d0bbd Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:11:35 +0800
Subject: [PATCH] new files

---
 controllers/task.go |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/controllers/task.go b/controllers/task.go
index 91892d0..999f82e 100644
--- a/controllers/task.go
+++ b/controllers/task.go
@@ -34,6 +34,7 @@
 	FaceExtract_VirtualSdkId = "virtual-faceextract-sdk-pull"//缁撴灉杈撳嚭鐨勭畻娉昳d
 )
 
+/*
 // @Summary 鏌ユ壘鎵�鏈変换鍔★紝鍖呭惈浠诲姟淇℃伅鍜屽搴旂殑绠楁硶淇℃伅
 // @Description 鏌ユ壘鎵�鏈変换鍔�
 // @Produce json
@@ -41,6 +42,7 @@
 // @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/findAll [GET]
+*/
 func (tc TaskController) FindAll(c *gin.Context) {
 	// 鏄剧ず鎵�鏈変换鍔�: 鑾峰彇淇℃伅
 	var taskApi dbapi.TaskApi
@@ -65,6 +67,7 @@
 	}
 }
 
+/*
 // @Summary 娣诲姞浠诲姟
 // @Description 鏌ユ壘鎵�鏈変换鍔�
 // @Accept json
@@ -73,7 +76,8 @@
 // @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
@@ -101,6 +105,7 @@
 	Sort int `json:"sort"`
 }
 
+/*
 // @Summary 缁欎换鍔℃坊鍔犵畻娉�
 // @Description 浠诲姟娣诲姞绠楁硶
 // @Produce json
@@ -109,6 +114,7 @@
 // @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)
@@ -120,12 +126,13 @@
 	var taskApi dbapi.TaskApi
 	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)
 	}
 }
 
+/*
 // @Summary 浠诲姟鍒犻櫎绠楁硶
 // @Description 鏍规嵁taskid鍜宻dkid鍒犻櫎
 // @Produce json
@@ -135,6 +142,7 @@
 // @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]
+*/
 func (tc TaskController) DeleteTaskSdk(c *gin.Context) {
 	var taskApi dbapi.TaskApi
 	taskId := c.Query("taskId")
@@ -151,6 +159,7 @@
 	}
 }
 
+/*
 // @Summary 鏇存柊浠诲姟鍚嶇О
 // @Description 鏇存柊浠诲姟鍚嶇О
 // @Produce json
@@ -160,6 +169,7 @@
 // @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]
+*/
 func (tc TaskController) UpdateTaskName(c *gin.Context) {
 	taskId := c.PostForm("taskId")
 	taskName := c.PostForm("taskName")
@@ -181,6 +191,7 @@
 	Enable bool `json:"enable"`
 }
 
+/*
 // @Summary 鏇存柊浠诲姟鐘舵��
 // @Description 锛堢畻娉曚笉鍙�,鍙洿鏂颁换鍔$姸鎬侊級
 // @Produce json
@@ -189,6 +200,7 @@
 // @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/updateTaskStatus [POST]
+*/
 func (tc TaskController) UpdateTaskStatus(c *gin.Context) {
 	var tsvo TaskStatusVo
 	err := c.BindJSON(&tsvo)
@@ -207,6 +219,7 @@
 }
 
 
+/*
 // @Summary 鍒犻櫎浠诲姟
 // @Description 鏍规嵁浠诲姟id鍒犻櫎浠诲姟
 // @Produce json
@@ -215,6 +228,7 @@
 // @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]
+*/
 func (tc TaskController) DeleteTask(c *gin.Context) {
 	var taskApi dbapi.TaskApi
 	taskId := c.Query("taskId")
@@ -244,6 +258,7 @@
 	SdkArgValue string `json:"sdk_arg_value"`
 }
 
+/*
 // @Summary 淇濆瓨绠楁硶瑙勫垯
 // @Description 淇濆瓨绠楁硶瑙勫垯
 // @Accept json
@@ -253,10 +268,11 @@
 // @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/saveTaskSdkRule [post]
+*/
 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
 	}
@@ -270,6 +286,7 @@
 	}
 }
 
+/*
 // @Summary 鍒犻櫎绠楁硶瑙勫垯
 // @Description 鍒犻櫎绠楁硶瑙勫垯
 // @Produce json
@@ -277,15 +294,17 @@
 // @Param id 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/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, "鍒犻櫎澶辫触")
@@ -293,6 +312,7 @@
 }
 
 
+/*
 // @Summary 鏌ヨ绠楁硶瑙勫垯
 // @Description 鏌ヨ绠楁硶瑙勫垯
 // @Produce json
@@ -302,6 +322,7 @@
 // @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]
+*/
 func (tc TaskController) GetRulesByTaskSdk(c *gin.Context) {
 	taskId := c.Query("taskId")
 	sdkId := c.Query("sdkId")

--
Gitblit v1.8.0