From a1ef2d42d320f075c75e8cef52a879114441c103 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 30 十月 2019 15:54:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/task.go | 92 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 77 insertions(+), 15 deletions(-)
diff --git a/controllers/task.go b/controllers/task.go
index 8366edc..dbb8761 100644
--- a/controllers/task.go
+++ b/controllers/task.go
@@ -2,9 +2,13 @@
import (
"basic.com/dbapi.git"
+ "basic.com/pubsub/esutil.git"
"basic.com/pubsub/protomsg.git"
"encoding/json"
+ "strconv"
"time"
+ "webserver/cache"
+ "webserver/extend/config"
"github.com/gin-gonic/gin"
"webserver/extend/code"
@@ -65,6 +69,62 @@
}
}
+// @Summary 妫�绱㈤〉闈㈣幏鍙栨墍鏈変换鍔″垪琛紙鍖呭惈宸插垹闄ょ殑浠诲姟锛�
+// @Description 妫�绱㈤〉闈㈣幏鍙栨墍鏈変换鍔″垪琛紙鍖呭惈宸插垹闄ょ殑浠诲姟锛�
+// @Produce json
+// @Tags task
+// @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/aggregateTaskList [GET]
+func (tc TaskController) AggregateTaskList(c *gin.Context) {
+ // 鏄剧ず鎵�鏈変换鍔�: 鑾峰彇淇℃伅
+ var taskApi dbapi.TaskApi
+
+ taskInfos := taskApi.FindAll()
+ m := make(map[string]string)
+ var arr []protomsg.TaskSdkInfo
+ for _,ti :=range taskInfos{
+ if ti.Task.Taskid != FaceExtract_VirtualTaskId{
+ arr = append(arr,ti)
+ m[ti.Task.Taskid] = ti.Task.Taskid
+ }
+ }
+ var tasks []TaskSdkVo
+ dataBytes, err := json.Marshal(arr)
+ if err !=nil {
+ util.ResponseFormat(c,code.ComError,[]TaskSdkVo{})
+ } else {
+ if err := json.Unmarshal(dataBytes, &tasks);err !=nil {
+ util.ResponseFormat(c,code.ComError,[]TaskSdkVo{})
+ } else {
+ //澶勭悊宸茶鍒犻櫎鐨勪换鍔�
+ localConf, _ := cache.GetServerInfo()
+ if localConf.AlarmIp != "" && localConf.ServerId != "" && localConf.AlarmPort>0 {
+ indexName := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
+ esTaskM, e := esutil.AggregateTaskList(localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)), indexName, localConf.ServerId)
+ if e==nil && esTaskM !=nil {
+ for _,tM :=range esTaskM {
+ if _,ok := m[tM["taskId"].(string)];!ok {//琛ㄧず姝や换鍔″凡琚垹闄�
+ taskId := tM["taskId"].(string)
+ m[taskId] = taskId
+ tasks = append(tasks, TaskSdkVo{
+ Task:TaskVo{
+ Taskid: taskId,
+ Taskname: tM["taskName"].(string),
+ DelFlag: true,
+ },
+ Sdks:[]SdkVo{},
+ })
+ }
+ }
+ }
+ }
+
+ util.ResponseFormat(c,code.Success,tasks)
+ }
+ }
+}
+
// @Summary 娣诲姞浠诲姟
// @Description 鏌ユ壘鎵�鏈変换鍔�
// @Accept json
@@ -73,7 +133,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
@@ -130,8 +190,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]
@@ -155,8 +215,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]
@@ -211,7 +271,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]
@@ -256,7 +316,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
}
@@ -274,18 +334,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, "鍒犻櫎澶辫触")
@@ -297,8 +359,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