From 838c3abb88fa8bf89c690b1a05de1c02bb79ee6c Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期三, 20 十一月 2019 20:24:31 +0800 Subject: [PATCH] fix alarmLevel to alarmLevel.raw --- controllers/capture.go | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/controllers/capture.go b/controllers/capture.go index 5d66d37..165c9aa 100644 --- a/controllers/capture.go +++ b/controllers/capture.go @@ -56,14 +56,16 @@ linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}}," prama := "{\"query\":{\"bool\":{\"should\":[" + "{\"bool\":{\"filter\":[" + - "{\"term\":{\"isAlarm\":\"1\"}}," + + "{\"term\":{\"isAlarm\":true}}," + cameraIdStr + analyServerFilterStr + + "{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" + "]}}," + "{\"bool\":{\"filter\":[" + - "{\"term\":{\"isAlarm\":\"1\"}}," + + "{\"term\":{\"isAlarm\":true}}," + linkTagInfoCameraIdStr + linkTagInfoAnalyServerFilterStr + + "{\"range\":{\"linkTagInfo.picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" + "]}}" + "]}}," + "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," + -- Gitblit v1.8.0