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/initForData.go | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/controllers/initForData.go b/controllers/initForData.go
index cce730b..fc0c9d4 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "basic.com/dbapi.git"
"fmt"
"github.com/gin-gonic/gin"
"strings"
@@ -18,28 +19,42 @@
// @Accept json
// @Produce json
// @Tags realTime
-// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}"
-// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
-// @Router /data/api-v/realTime/action [POST]
-//瀹炴椂鎶撴媿鏁版嵁鍒濆鍖�
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
+// @Router /data/api-v/realTime/initForCaptureData [POST]
func (rc *RealTimeController) InitForCaptureData(c *gin.Context) {
searchBody := make(map[string]interface{}, 0)
c.BindJSON(&searchBody)
index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + index + "/_search"
+ cameraIdStr := ""
+ if searchBody["treeNodes"] !=nil {
+ cameraId := searchBody["treeNodes"].([]interface{})
+ if cameraId != nil && len(cameraId) > 0 {
+ esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
+ cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
+ }
+ }
+
var setApi dbapi.SysSetApi
_, sysconf := setApi.GetServerInfo()
analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"
prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isAlarm\":\"1\"}}," +
+ cameraIdStr +
analyServerFilterStr +
"]}},\"size\":\"20\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"isAlarm\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]" +
"}"
- fmt.Println(prama)
+ //logger.Debug("InitForCaptureData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
util.ResponseFormat(c, code.Success, tokenRes)
+}
+
+type InitForMonitorArg struct {
+ TreeNodes []string `json:"treeNodes"`
+ Tasks []string `json:"tasks"`
}
// @Summary 瀹炴椂浠诲姟鐩戞帶鏁版嵁鍒濆鍖�
@@ -47,25 +62,24 @@
// @Accept json
// @Produce json
// @Tags realTime
-// @Param obj body map true "搴曞簱鏁版嵁"
+// @Param obj body controllers.InitForMonitorArg true "瀹炴椂浠诲姟鐩戞帶鍙傛暟"
// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}"
// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
-// @Router /data/api-v/realTime/monitoring [POST]
-//瀹炴椂鐩戞帶鏁版嵁鍒濆鍖�
+// @Router /data/api-v/realTime/initForMonitoringData [POST]
func (rc *RealTimeController) InitForMonitoringData(c *gin.Context) {
- searchBody := make(map[string]interface{}, 0)
-
+ //searchBody := make(map[string]interface{}, 0)
+ var searchBody InitForMonitorArg
c.BindJSON(&searchBody)
- index := config.EsInfo.EsIndex.VideoPersons.IndexName
+ index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
cameraIdStr := ""
- cameraId := searchBody["treeNodes"].([]interface{})
+ cameraId := searchBody.TreeNodes
if cameraId != nil && len(cameraId) > 0 {
esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
}
//鍒ゆ柇浠诲姟ID
taskIdStr := "{\"terms\":{\"taskId\":[]}},"
- taskId := searchBody["tasks"].([]interface{})
+ taskId := searchBody.Tasks
if taskId != nil && len(taskId) > 0 {
esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
@@ -75,7 +89,7 @@
"/" + index + "/_search"
var setApi dbapi.SysSetApi
_, sysconf := setApi.GetServerInfo()
- analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}},"
+ analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"
prama := "{\"query\":{\"bool\":{\"filter\":[" +
cameraIdStr +
@@ -85,7 +99,8 @@
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"20\"," +
"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
- fmt.Println(prama)
+ //logger.Debug("url:", url)
+ //logger.Debug("InitForMonitoringData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
util.ResponseFormat(c, code.Success, tokenRes)
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0