From 967d7fe48dcad853fc83a6f4430301c5291ed40b Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 24 七月 2019 15:21:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/esSearch.go | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 99b1ceb..f55fff7 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -32,6 +32,34 @@
data := findEsData(searchBody)
util.ResponseFormat(c, code.Success, data)
}
+//鑾峰彇鐩戞帶绛夌骇
+func getAlarmLevel(alarmlevel []int) ([]string) {
+ d := dbapi.DicApi{}
+ res,data := d.FindByType("ALARMLEVEL")
+ if data == 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("dsadas")
+ }
+ alarmLevel[vl] = name
+ }
+ 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{} {
webPage := int(searchBody["page"].(float64))
@@ -76,12 +104,24 @@
index = config.EsInfo.EsIndex.VideoPersons.IndexName
esTableIdStr = "{\"terms\":{\"baseInfo.tableId\":[\"" + esTableId + "\"]}},"
}
+ //鍒ゆ柇鏀惰棌鐘舵��
isCollectStr := ""
isCollect := searchBody["collection"].(string)
if isCollect != "" {
isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
}
-
+ //鍒ゆ柇甯冮槻绛夌骇id
+ alarmLevelId :=searchBody["alarmlevel"].([]interface{})
+ alarmLevelStr := ""
+ if alarmLevelId != nil && alarmLevelId != 0{
+ if alarmLevelId != -1 {
+ id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevel)), "[]"), " ", "\",\"", -1)
+ alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},{\"term\":{\"alarmRules.defenceState\":true}},"
+ }else{
+ alarmLevelStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
+ }
+ }
+
//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
//璇锋眰澶�
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
@@ -96,6 +136,7 @@
"\"query\":{\"bool\":{" + queryStr +
"\"filter\":[" +
cameraIdStr +
+ alarmLevelStr +
taskIdStr +
isCollectStr +
esTableIdStr +
--
Gitblit v1.8.0