From 49cfcc47663e682ed32259cbb1623e940b13468c Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期三, 31 七月 2019 14:30:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/fileController.go | 2
service/FaceCompareService.go | 4 +-
controllers/task.go | 69 +++++++++++++++++++++++++++++++---
router/router.go | 4 +
4 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index a82d000..9ad7591 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -220,7 +220,7 @@
",inputValue:",arg.InputValue,",tasks:",arg.Tasks,",compThreshold:",arg.CompareThreshold)
compareService := service.NewFaceCompareService(arg)
compareOnce := compareService.Compare()
- logger.Debug("compareResult:",*compareOnce)
+ //logger.Debug("compareResult.len:",*compareOnce)
dataList := compareOnce.CompareData
service.SortByScore(dataList)
totalList := len(dataList)
diff --git a/controllers/task.go b/controllers/task.go
index fd27cda..bc9392c 100644
--- a/controllers/task.go
+++ b/controllers/task.go
@@ -92,6 +92,12 @@
util.ResponseFormat(c, code.Success, data)
}
+type TaskSdkAdd struct {
+ TaskId string `json:"taskId"`
+ SdkId string `json:"sdkId"`
+ Sort int `json:"sort"`
+}
+
// @Summary 缁欎换鍔℃坊鍔犵畻娉�
// @Description 浠诲姟娣诲姞绠楁硶
// @Produce json
@@ -100,16 +106,16 @@
// @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/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 == "" || addVo.SdkId == "" {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
- flag,data := taskApi.AddTaskSdk(taskId,sdkId)
+ var taskApi dbapi.TaskApi
+ flag,data := taskApi.AddTaskSdk(addVo.TaskId, addVo.SdkId, addVo.Sort)
if flag {
util.ResponseFormat(c, code.ComError, data)
} else {
@@ -140,6 +146,31 @@
} else {
util.ResponseFormat(c,code.Success,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 +229,13 @@
}
type TaskSdkRules struct {
+ 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"`
@@ -235,6 +267,29 @@
}
}
+// @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/deleteTaskSdkRuleById [post]
+func (tc TaskController) DeleteTaskSdkRuleById(c *gin.Context) {
+ id := c.PostForm("id")
+ if id == "" {
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+ var api dbapi.TaskSdkRuleApi
+ if api.DeleteTaskSdkRuleById(id) {
+ util.ResponseFormat(c,code.Success,"鍒犻櫎鎴愬姛")
+ } else {
+ util.ResponseFormat(c,code.ComError, "鍒犻櫎澶辫触")
+ }
+}
+
+
// @Summary 鏌ヨ绠楁硶瑙勫垯
// @Description 鏌ヨ绠楁硶瑙勫垯
// @Produce json
diff --git a/router/router.go b/router/router.go
index b17ce78..56ff1be 100644
--- a/router/router.go
+++ b/router/router.go
@@ -119,9 +119,11 @@
task.POST("/addTask", taskController.AddTask)
task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
task.GET("/deleteTask", taskController.DeleteTask)
- task.GET("/addTaskSdk", taskController.AddTaskSdk)
+ task.POST("/addTaskSdk", taskController.AddTaskSdk)
task.GET("/deleteTaskSdk", taskController.DeleteTaskSdk)
+ task.POST("/updateTaskName", taskController.UpdateTaskName)
task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
+ task.POST("/deleteTaskSdkRuleById", taskController.DeleteTaskSdkRuleById)
}
// 妫�绱� 鏌ヨ
diff --git a/service/FaceCompareService.go b/service/FaceCompareService.go
index bf1a322..71543ef 100644
--- a/service/FaceCompareService.go
+++ b/service/FaceCompareService.go
@@ -192,8 +192,8 @@
personIds = append(personIds,v.Id)
}
}
- logger.Debug("comp personIds:", personIds)
- logger.Debug("comp captureIds:",captureIds)
+ logger.Debug("comp len(personIds):", len(personIds))
+ logger.Debug("comp len(captureIds):", len(captureIds))
esServerIp := config.EsInfo.Masterip
esServerPort := config.EsInfo.Httpport
index := config.EsInfo.EsIndex.Dbtablepersons.IndexName
--
Gitblit v1.8.0