From 2dda39aa3ca4488bfa270f0be8e886a3773c9707 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期三, 24 七月 2019 13:39:56 +0800
Subject: [PATCH] fix alarmLevel

---
 controllers/esSearch.go |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 27e21eb..f55fff7 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -32,35 +32,33 @@
 	data := findEsData(searchBody)
 	util.ResponseFormat(c, code.Success, data)
 }
-
-func getAlarmLevel(alarmlevel int) (string) {
+//鑾峰彇鐩戞帶绛夌骇
+func getAlarmLevel(alarmlevel []int) ([]string) {
 	d := dbapi.DicApi{}
         res,data := d.FindByType("ALARMLEVEL")
         if data == nil {
-                fmt.Println("data is nil")
+                fmt.Println("dsadasd")
         }
 	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"]) 
 			val := value.(map[string]interface{})["value"].(string)
 			name := value.(map[string]interface{})["name"].(string)
 			vl,err := strconv.Atoi(val)
 			if err != nil {
-				fmt.Println(err)
+				fmt.Println("dsadas")
 			}
 			alarmLevel[vl] = name
-
 		}
-		
-		// fmt.Println(alarmLevel)
-
-		alarmLevelRes = alarmLevel[alarmlevel]
-		return alarmLevelRes	
+	alarmLevelRes := make([]string,len(alarmlevel))
+		for i,v := range  alarmlevel  {
+			alarmLevelRes[i] =  alarmLevel[v]
+		}
+	return alarmLevelRes	
 }
 
 func findEsData(searchBody map[string]interface{}) map[string]interface{} {
@@ -113,15 +111,14 @@
 		isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
 	}
 	//鍒ゆ柇甯冮槻绛夌骇id
-	alarmLevelId :=searchBody["alarmlevel"].(int)
+	alarmLevelId :=searchBody["alarmlevel"].([]interface{})
 	alarmLevelStr := ""
 	if alarmLevelId != nil && alarmLevelId != 0{
 		if alarmLevelId != -1 {
-			id := getAlarmLevel(alarmLevelId)
-			alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},{\"terms\":{\"alarmRules.defenceState\":[\"true\"]}},"
-
+			id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevel)), "[]"), " ", "\",\"", -1)
+			alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},{\"term\":{\"alarmRules.defenceState\":true}},"
 		}else{
-			alarmLevelStr = "{\"terms\":{\"alarmRules.defenceState\":[\"false\"]}},"
+			alarmLevelStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
 		}
 	}
 	

--
Gitblit v1.8.0