From dbd113b0d0ec86232c8f34758474f24487352207 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 26 七月 2019 13:48:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/initForData.go | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/controllers/initForData.go b/controllers/initForData.go
index 78dd39e..2dbeb26 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -57,7 +57,7 @@
searchBody := make(map[string]interface{}, 0)
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{})
if cameraId != nil && len(cameraId) > 0 {
@@ -76,7 +76,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 +
--
Gitblit v1.8.0