From f88a44f58396fb36a979cfe5640a36d6ac2d7289 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 25 七月 2019 14:50:56 +0800
Subject: [PATCH] add discovery
---
controllers/esSearch.go | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 42c2af8..971857d 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -111,24 +111,24 @@
isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
}
//鍒ゆ柇甯冮槻绛夌骇id
- alarmLevelId :=searchBody["alarmlevel"].([]interface{})
+ alarmLevelId :=searchBody["alarmlevel"].([]int)
alarmLevelStr := ""
- defenceStateStr = ""
+ defenceStateStr := ""
if len(alarmLevelId) > 0 {
flag := false
for i,v := range alarmLevelId {
if v == -1 {
- alarmLevelId = append(alarmLevel[:i], alarmLevel[i+1:]...)
+ alarmLevelId = append(alarmLevelId[:i], alarmLevelId[i+1:]...)
defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
flag = true
- breake
+ break
}
}
if len(alarmLevelId) > 0{
if flag == false {
defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":true}},"
}
- id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevel)), "[]"), " ", "\",\"", -1)
+ id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},"
}
}
@@ -148,6 +148,7 @@
"\"filter\":[" +
cameraIdStr +
alarmLevelStr +
+ defenceStateStr +
taskIdStr +
isCollectStr +
esTableIdStr +
--
Gitblit v1.8.0