From a06945a8759b65aa653073cc83254f9c7f1ccf11 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 26 七月 2019 14:04:08 +0800
Subject: [PATCH] fix esData

---
 controllers/initForData.go |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/controllers/initForData.go b/controllers/initForData.go
index 81e542a..2dbeb26 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"
@@ -56,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 {
@@ -75,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