From f4e8f206a6760bdc31734dfcb1c65916b5b76311 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 22 八月 2019 12:05:58 +0800
Subject: [PATCH] add cluster
---
controllers/task.go | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/controllers/task.go b/controllers/task.go
index fd27cda..f27e9d0 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
@@ -92,28 +92,37 @@
util.ResponseFormat(c, code.Success, data)
}
+type TaskSdkAdd struct {
+ TaskId string `json:"taskId"`
+ Sdks []SdkSort `json:"sdks"`
+}
+type SdkSort struct {
+ SdkId string `json:"sdkId"`
+ Sort int `json:"sort"`
+}
+
// @Summary 缁欎换鍔℃坊鍔犵畻娉�
// @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 [GET]
+// @Router /data/api-v/task/addTaskSdk [post]
func (tc TaskController) AddTaskSdk(c *gin.Context) {
- var taskApi dbapi.TaskApi
- taskId := c.Query("taskId")
- sdkId := c.Query("sdkId")
- if taskId == "" || sdkId == "" {
+ var addVo TaskSdkAdd
+ err := c.BindJSON(&addVo)
+ if err !=nil || addVo.TaskId == "" || len(addVo.Sdks)==0 {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
- flag,data := taskApi.AddTaskSdk(taskId,sdkId)
+ paramBody := util.Struct2Map(addVo)
+ 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)
}
}
@@ -136,10 +145,35 @@
}
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)
}
+}
+
+// @Summary 鏇存柊浠诲姟鍚嶇О
+// @Description 鏇存柊浠诲姟鍚嶇О
+// @Produce json
+// @Tags task
+// @Param taskId query string true "taskId"
+// @Param taskName query 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]
+func (tc TaskController) UpdateTaskName(c *gin.Context) {
+ taskId := c.PostForm("taskId")
+ taskName := c.PostForm("taskName")
+ if taskId == "" || taskName == "" {
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+ var api dbapi.TaskApi
+ if api.UpdateTaskName(taskId, taskName) {
+ util.ResponseFormat(c,code.UpdateSuccess,"鏇存柊鎴愬姛")
+ } else {
+ util.ResponseFormat(c,code.ComError,"鏇存柊澶辫触")
+ }
+
}
type TaskStatusVo struct {
@@ -198,12 +232,13 @@
}
type TaskSdkRules struct {
- rules []TaskSdkRuleVo `json:"rules"`
+ TaskId string `json:"taskId"`
+ SdkId string `json:"sdkId"`
+ Rules []TaskSdkRuleVo `json:"rules"`
}
type TaskSdkRuleVo struct {
Id string `json:"id"`
- TaskSdkId string `json:"task_sdk_id"`
SdkArgAlias string `json:"sdk_arg_alias"`
Operator string `json:"operator"`
SdkArgValue string `json:"sdk_arg_value"`
@@ -221,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
}
@@ -235,6 +270,30 @@
}
}
+// @Summary 鍒犻櫎绠楁硶瑙勫垯
+// @Description 鍒犻櫎绠楁硶瑙勫垯
+// @Produce json
+// @Tags 绠楁硶瑙勫垯
+// @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/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.DeleteTaskSdkRule(taskId, sdkId) {
+ util.ResponseFormat(c,code.Success,"鍒犻櫎鎴愬姛")
+ } else {
+ util.ResponseFormat(c,code.ComError, "鍒犻櫎澶辫触")
+ }
+}
+
+
// @Summary 鏌ヨ绠楁硶瑙勫垯
// @Description 鏌ヨ绠楁硶瑙勫垯
// @Produce json
--
Gitblit v1.8.0