From 91cb9553117a1875edce05bb213f2ce96dc2ac26 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期三, 31 七月 2019 15:05:17 +0800
Subject: [PATCH] add cameraId filter
---
controllers/initForData.go | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/controllers/initForData.go b/controllers/initForData.go
index 4f96400..6838ddd 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -29,11 +29,18 @@
index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + index + "/_search"
+ cameraIdStr := ""
+ 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\"]" +
@@ -57,7 +64,7 @@
searchBody := make(map[string]interface{}, 0)
c.BindJSON(&searchBody)
- index := config.EsInfo.EsIndex.VideoPersons.IndexName +","+config.EsInfo.EsIndex.Personaction.IndexName
+ index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
cameraIdStr := ""
cameraId := searchBody["treeNodes"].([]interface{})
if cameraId != nil && len(cameraId) > 0 {
@@ -90,4 +97,4 @@
//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