From 3566c2630dc2ac33e03fb6df5ec2cd19e1625a68 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 27 九月 2019 15:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/esSearch.go | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index feeb04c..1ae3ba5 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -101,6 +101,15 @@
gteDate := searchTime[0]
lteDate := searchTime[1]
+
+ //鍒ゆ柇浜哄憳ID
+ personIdStr := ""
+ personId := searchBody.Id
+ 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 +117,7 @@
esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
}
+
//鍒ゆ柇鎽勫儚鏈篒D
cameraIdStr := ""
cameraId := searchBody.TreeNodes
@@ -158,6 +168,7 @@
"\"filter\":[" +
cameraIdStr +
alarmLevelStr +
+ personIdStr +
taskIdStr +
isCollectStr +
esTableIdStr +
--
Gitblit v1.8.0