From 4c7890a506f95bfc8d06a75dbf6150bb8fcad1bb Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 28 九月 2019 15:28:32 +0800
Subject: [PATCH] add logger

---
 controllers/esSearch.go |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index feeb04c..5d4e72b 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -101,6 +101,16 @@
 
 	gteDate := searchTime[0]
 	lteDate := searchTime[1]
+
+	//鍒ゆ柇浜哄憳ID
+	personIdStr := ""
+	//personId := searchBody.Id
+	personId := []string{}
+	if personId != nil && len(personId) > 0 {
+		esPersonId := strings.Replace(strings.Trim(fmt.Sprint(personId), "[]"), " ", "\",\"", -1)
+		personIdStr = "{\"terms\":{\"id\":[\"" + esPersonId + "\"]}},"
+	}
+
 	//鍒ゆ柇浠诲姟ID
 	taskIdStr := ""
 	taskId := searchBody.Tasks
@@ -108,6 +118,7 @@
 		esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
 		taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
 	}
+
 	//鍒ゆ柇鎽勫儚鏈篒D
 	cameraIdStr := ""
 	cameraId := searchBody.TreeNodes
@@ -158,6 +169,7 @@
 		"\"filter\":[" +
 		cameraIdStr +
 		alarmLevelStr +
+		personIdStr +
 		taskIdStr +
 		isCollectStr +
 		esTableIdStr +

--
Gitblit v1.8.0