From d763c269240d5a6092aef0a342f2ccb0e1bca614 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期四, 25 七月 2019 14:02:18 +0800
Subject: [PATCH] fix alarmLevel
---
controllers/esSearch.go | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 0a9f139..79c8959 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -37,12 +37,11 @@
d := dbapi.DicApi{}
res,data := d.FindByType("ALARMLEVEL")
if data == nil {
- fmt.Println("dsadasd")
+ fmt.Println("data is nil")
}
fmt.Println(res)
// fmt.Println(data)
alarmLevel := make(map[int]string)
-
tmp := data.(map[string]interface{})
for _,value := range tmp["ALARMLEVEL"].([]interface{}) {
// fmt.Println(value.(map[string]interface{})["value"]," ",value.(map[string]interface{})["name"])
@@ -50,13 +49,17 @@
name := value.(map[string]interface{})["name"].(string)
vl,err := strconv.Atoi(val)
if err != nil {
- fmt.Println("dsadas")
+ fmt.Println(err)
}
alarmLevel[vl] = name
}
alarmLevelRes := make([]string,len(alarmlevel))
for i,v := range alarmlevel {
- alarmLevelRes[i] = alarmLevel[v]
+ if v < 0 {
+ alarmLevelRes[i] = "鎾ら槻"
+ }else {
+ alarmLevelRes[i] = alarmLevel[v]
+ }
}
return alarmLevelRes
}
@@ -111,27 +114,12 @@
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 := ""
+ if len(alarmLevelId) > 0 {
+ alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
+ alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
+ }
//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
//璇锋眰澶�
@@ -147,8 +135,7 @@
"\"query\":{\"bool\":{" + queryStr +
"\"filter\":[" +
cameraIdStr +
- // alarmLevelStr +
- // defenceStateStr +
+ alarmLevelStr +
taskIdStr +
isCollectStr +
esTableIdStr +
--
Gitblit v1.8.0