From d43f2d92ecb60430da9331958b3a3573b4aecb35 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期二, 29 十月 2019 17:19:08 +0800 Subject: [PATCH] GetAllLocalVideopersonsId add alarmLevelTypes --- EsApi.go | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/EsApi.go b/EsApi.go index 9c6faf1..0feceb8 100644 --- a/EsApi.go +++ b/EsApi.go @@ -287,7 +287,7 @@ } //鑾峰彇褰撳墠鑺傜偣鎶撴媿搴撴墍鏈変汉鍛業D -func GetAllLocalVideopersonsId(compareArgs protomsg.CompareArgs, indexName string, serverIp string, serverPort string) (capturetable []string) { +func GetAllLocalVideopersonsId(compareArgs protomsg.CompareArgs, indexName string, serverIp string, serverPort string, alarmLevelTypes string) (capturetable []string) { queryStr := "" queryBody := compareArgs.InputValue //妫�绱㈡ @@ -329,6 +329,12 @@ isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}}," } + //鍒ゆ柇甯冮槻绛夌骇 + alarmLevelStr := "" + if alarmLevelTypes !="" { + alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}}," + } + //浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉 analyServerFilterStr := "" @@ -353,6 +359,7 @@ "\"query\":{\"bool\":{" + queryStr + "\"filter\":[" + cameraIdStr + + alarmLevelStr + taskIdStr + isCollectStr + esTableIdStr + -- Gitblit v1.8.0