From c7a8ae9004aab2ae40be3d4b12cd31d184da1549 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 31 八月 2019 15:55:10 +0800
Subject: [PATCH] facedetect done
---
controllers/esSearch.go | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 3e85590..411fe93 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -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