From fc7857418282b4cc418a035f0739834f7c6b99d3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 30 七月 2019 14:12:47 +0800
Subject: [PATCH] fix compare and add tasksdkrule
---
service/FaceCompareService.go | 9 ----
controllers/task.go | 86 ++++++++++++++++++++++++++++++++++++++----
router/router.go | 1
3 files changed, 79 insertions(+), 17 deletions(-)
diff --git a/controllers/task.go b/controllers/task.go
index b70e24b..fd27cda 100644
--- a/controllers/task.go
+++ b/controllers/task.go
@@ -142,24 +142,28 @@
}
}
+type TaskStatusVo struct {
+ TaskId string `json:"taskId"`
+ Enable bool `json:"enable"`
+}
+
// @Summary 鏇存柊浠诲姟鐘舵��
// @Description 锛堢畻娉曚笉鍙�,鍙洿鏂颁换鍔＄姸鎬侊級
// @Produce json
// @Tags task
-// @Param taskId path string true "浠诲姟id"
-// @Param taskName path string true "浠诲姟鍚嶇О"
-// @Param isAlarm path bool true "鏄惁鎶ヨ"
-// @Param isEnable path bool true "鏄惁鍋滅敤"
+// @Param taskStatus body controllers.TaskStatusVo true "鍙傛暟"
// @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)
+ if err !=nil {
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
var taskApi dbapi.TaskApi
- paramBody :=make(map[string]string,0)
- paramBody["taskId"] = c.Query("taskId")
- paramBody["taskName"] = c.Query("taskName")
- paramBody["isAlarm"] = c.Query("isAlarm")
- paramBody["isEnable"] = c.Query("isEnable")
+ paramBody := util.Struct2Map(tsvo)
flag, data := taskApi.UpdateTaskStatus(paramBody)
if flag {
util.ResponseFormat(c,code.Success,data)
@@ -167,6 +171,7 @@
util.ResponseFormat(c,code.ComError,data)
}
}
+
// @Summary 鍒犻櫎浠诲姟
// @Description 鏍规嵁浠诲姟id鍒犻櫎浠诲姟
@@ -191,3 +196,66 @@
}
}
+
+type TaskSdkRules struct {
+ 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"`
+}
+
+// @Summary 淇濆瓨绠楁硶瑙勫垯
+// @Description 淇濆瓨绠楁硶瑙勫垯
+// @Accept json
+// @Produce json
+// @Tags 绠楁硶瑙勫垯
+// @Param sdkrules body controllers.TaskSdkRules true "绠楁硶鍙傛暟瑙勫垯"
+// @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 {
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+ paramBody := util.Struct2Map(rules)
+ var api dbapi.TaskSdkRuleApi
+ b,d := api.SaveTaskSdkRule(paramBody)
+ if b {
+ util.ResponseFormat(c,code.Success,d)
+ } else {
+ util.ResponseFormat(c,code.ComError,"淇濆瓨澶辫触")
+ }
+}
+
+// @Summary 鏌ヨ绠楁硶瑙勫垯
+// @Description 鏌ヨ绠楁硶瑙勫垯
+// @Produce json
+// @Tags 绠楁硶瑙勫垯
+// @Param taskId path string true "浠诲姟id"
+// @Param sdkId path 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]
+func (tc TaskController) GetRulesByTaskSdk(c *gin.Context) {
+ taskId := c.Query("taskId")
+ sdkId := c.Query("sdkId")
+ if taskId == "" || sdkId == ""{
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+ var taskSdkApi dbapi.TaskSdkRuleApi
+ b, d := taskSdkApi.GetRulesByTaskSdk(taskId, sdkId)
+ if b {
+ util.ResponseFormat(c,code.Success,d)
+ } else {
+ util.ResponseFormat(c,code.ComError,"鏌ヨ澶辫触")
+ }
+}
diff --git a/router/router.go b/router/router.go
index b7977dd..b17ce78 100644
--- a/router/router.go
+++ b/router/router.go
@@ -121,6 +121,7 @@
task.GET("/deleteTask", taskController.DeleteTask)
task.GET("/addTaskSdk", taskController.AddTaskSdk)
task.GET("/deleteTaskSdk", taskController.DeleteTaskSdk)
+ task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
}
// 妫�绱� 鏌ヨ
diff --git a/service/FaceCompareService.go b/service/FaceCompareService.go
index 83b9b58..bf1a322 100644
--- a/service/FaceCompareService.go
+++ b/service/FaceCompareService.go
@@ -255,7 +255,7 @@
CameraAddr: vp.CameraAddr,
PicDate: vp.PicDate,
PicMaxUrl: vp.PicMaxUrl,
- PicSmUrl: parsePicSmUrl(vp.PicSmUrl),
+ PicSmUrl: vp.PicSmUrl,
IsAlarm: isAlarmInt,
Sex: vp.Sex,
AgeDescription: vp.AgeDescription,
@@ -270,13 +270,6 @@
}
}
return resultList
-}
-
-func parsePicSmUrl(picSmUrl string) []string {
- if picSmUrl != ""{
- return []string{ picSmUrl }
- }
- return []string{}
}
func parseMonitorLevel(level string) string {
--
Gitblit v1.8.0