From 9fc8b8adf2f2856a545682e185512aa0e45ac06c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 05 九月 2019 14:57:07 +0800
Subject: [PATCH] add go.mod go.sum
---
controllers/esSearch.go | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 3e85590..9172bac 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -9,7 +9,7 @@
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
"webserver/models"
)
@@ -42,7 +42,7 @@
}
//鑾峰彇鐩戞帶绛夌骇
-func getAlarmLevel(alarmlevel []string) []string {
+func getAlarmLevel(alarmlevel []int32) []string {
d := dbapi.DicApi{}
res, data := d.FindByType("ALARMLEVEL")
if data == nil {
@@ -50,7 +50,7 @@
}
logger.Debug(res)
// logger.Debug(data)
- alarmLevel := make(map[int]string)
+ alarmLevel := make(map[int32]string)
tmp := data.(map[string]interface{})
for _, value := range tmp["ALARMLEVEL"].([]interface{}) {
// logger.Debug(value.(map[string]interface{})["value"]," ",value.(map[string]interface{})["name"])
@@ -60,15 +60,14 @@
if err != nil {
logger.Debug(err)
}
- alarmLevel[vl] = name
+ alarmLevel[int32(vl)] = name
}
alarmLevelRes := make([]string, len(alarmlevel))
for i, v := range alarmlevel {
- value,_ := strconv.Atoi(v)
- if value < 0 {
+ if v < 0 {
alarmLevelRes[i] = "鎾ら槻"
} else {
- alarmLevelRes[i] = alarmLevel[value]
+ alarmLevelRes[i] = alarmLevel[v]
}
}
return alarmLevelRes
--
Gitblit v1.8.0