From f86d25d5143847692779dd4e81b7e47d9b25376e Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期二, 30 七月 2019 11:16:15 +0800
Subject: [PATCH] fix delete dbtable add GetTotalFromDb and EsReq
---
controllers/esSearch.go | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 4e23425..92c74df 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -56,10 +56,11 @@
}
alarmLevelRes := make([]string,len(alarmlevel))
for i,v := range alarmlevel {
- if v.(int) < 0 {
+ value := int(v.(float64))
+ if value < 0 {
alarmLevelRes[i] = "鎾ら槻"
}else {
- alarmLevelRes[i] = alarmLevel[v.(int)]
+ alarmLevelRes[i] = alarmLevel[value]
}
}
return alarmLevelRes
@@ -72,7 +73,7 @@
from := strconv.Itoa((webPage - 1) * webSize)
//esFrom := strconv.Itoa(from)
//esSize := strconv.Itoa(webSize)
- size := strconv.Itoa(webPage * webSize)
+ size := strconv.Itoa(webSize)
//璇锋眰绱㈠紩
index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
queryStr := ""
@@ -145,7 +146,7 @@
"\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," +
"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]" +
"}"
- logger.Debug(prama)
+ //logger.Debug("findEsData.param:",prama)
//鏁版嵁瑙ｆ瀽
tokenRes := esutil.GetEsDataReq(url, prama, true)
return tokenRes
--
Gitblit v1.8.0