From 135644d52bb9f9ad9f05831b1bd1fbb01f06082d Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期四, 25 七月 2019 10:22:52 +0800
Subject: [PATCH] disable alarmLevel
---
controllers/esSearch.go | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 971857d..0a9f139 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -111,27 +111,27 @@
isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
}
//鍒ゆ柇甯冮槻绛夌骇id
- alarmLevelId :=searchBody["alarmlevel"].([]int)
- alarmLevelStr := ""
- defenceStateStr := ""
- if len(alarmLevelId) > 0 {
- flag := false
- for i,v := range alarmLevelId {
- if v == -1 {
- alarmLevelId = append(alarmLevelId[:i], alarmLevelId[i+1:]...)
- defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
- flag = true
- break
- }
- }
- if len(alarmLevelId) > 0{
- if flag == false {
- defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":true}},"
- }
- id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
- alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},"
- }
- }
+ // alarmLevelId :=searchBody["alarmlevel"].([]int)
+ // alarmLevelStr := ""
+ // defenceStateStr := ""
+ // if len(alarmLevelId) > 0 {
+ // flag := false
+ // for i,v := range alarmLevelId {
+ // if v == -1 {
+ // alarmLevelId = append(alarmLevelId[:i], alarmLevelId[i+1:]...)
+ // defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
+ // flag = true
+ // break
+ // }
+ // }
+ // if len(alarmLevelId) > 0{
+ // if flag == false {
+ // defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":true}},"
+ // }
+ // id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
+ // alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},"
+ // }
+ // }
//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
//璇锋眰澶�
@@ -147,8 +147,8 @@
"\"query\":{\"bool\":{" + queryStr +
"\"filter\":[" +
cameraIdStr +
- alarmLevelStr +
- defenceStateStr +
+ // alarmLevelStr +
+ // defenceStateStr +
taskIdStr +
isCollectStr +
esTableIdStr +
--
Gitblit v1.8.0