From ffef2b2c610dc69f3a84e6e94653339ae72cd922 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 24 八月 2019 16:13:22 +0800
Subject: [PATCH] fix alarmlevel
---
controllers/esSearch.go | 7 +++----
models/esSearch.go | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 3e85590..8b51bb9 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -42,7 +42,7 @@
}
//鑾峰彇鐩戞帶绛夌骇
-func getAlarmLevel(alarmlevel []string) []string {
+func getAlarmLevel(alarmlevel []int) []string {
d := dbapi.DicApi{}
res, data := d.FindByType("ALARMLEVEL")
if data == nil {
@@ -64,11 +64,10 @@
}
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
diff --git a/models/esSearch.go b/models/esSearch.go
index b90d70b..3ced5f5 100644
--- a/models/esSearch.go
+++ b/models/esSearch.go
@@ -14,7 +14,7 @@
IsAggs bool `json:"isAggs"`//
InputValue string `json:"inputValue"`//杈撳叆妗�
Collection string `json:"collection"`//
- AlarmLevel []string `json:"alarmLevel"`//甯冮槻绛夌骇
+ AlarmLevel []int32 `json:"alarmLevel"`//甯冮槻绛夌骇
CompareNum string `json:"compareNum"`//姣斿缂栧彿
CaptureId string `json:"captureId"`//鎶撴媿id
}
--
Gitblit v1.8.0