From 28bf0226d1df3817bec0947d6d1ad11356dcd290 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期三, 31 七月 2019 14:30:12 +0800
Subject: [PATCH] add endTime omitenpty add taglist serverId filter add baseInfo{persoNname phoneNum sex} to queryBody
---
controllers/esSearch.go | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 92c74df..ef49c27 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -33,37 +33,38 @@
data := findEsData(searchBody)
util.ResponseFormat(c, code.Success, data)
}
+
//鑾峰彇鐩戞帶绛夌骇
-func getAlarmLevel(alarmlevel []interface{}) ([]string) {
+func getAlarmLevel(alarmlevel []interface{}) []string {
d := dbapi.DicApi{}
- res,data := d.FindByType("ALARMLEVEL")
- if data == nil {
- logger.Debug("data is nil")
- }
+ res, data := d.FindByType("ALARMLEVEL")
+ if data == nil {
+ logger.Debug("data is nil")
+ }
logger.Debug(res)
- // logger.Debug(data)
+ // logger.Debug(data)
alarmLevel := make(map[int]string)
tmp := data.(map[string]interface{})
- for _,value := range tmp["ALARMLEVEL"].([]interface{}) {
- // logger.Debug(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 {
- logger.Debug(err)
- }
- alarmLevel[vl] = name
+ for _, value := range tmp["ALARMLEVEL"].([]interface{}) {
+ // logger.Debug(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 {
+ logger.Debug(err)
}
- alarmLevelRes := make([]string,len(alarmlevel))
- for i,v := range alarmlevel {
- value := int(v.(float64))
- if value < 0 {
- alarmLevelRes[i] = "鎾ら槻"
- }else {
- alarmLevelRes[i] = alarmLevel[value]
- }
+ alarmLevel[vl] = name
+ }
+ alarmLevelRes := make([]string, len(alarmlevel))
+ for i, v := range alarmlevel {
+ value := int(v.(float64))
+ if value < 0 {
+ alarmLevelRes[i] = "鎾ら槻"
+ } else {
+ alarmLevelRes[i] = alarmLevel[value]
}
- return alarmLevelRes
+ }
+ return alarmLevelRes
}
func findEsData(searchBody map[string]interface{}) map[string]interface{} {
@@ -80,7 +81,7 @@
queryBody := searchBody["inputValue"].(string)
//妫�绱㈡
if queryBody != "" {
- queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"alarmRules.alarmLevel^1.5\",\"ageDescription^1.5\",\"taskName^1.5\",\"baseInfo.tableName^1.5\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"baseInfo.idCard^1.8\",\"cameraAddr^1.0\"]," +
+ queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"baseInfo.sex\",\"baseInfo.phoneNum.raw^1.5\",\"baseInfo.personName.raw^1.5\",\"alarmRules.alarmLevel^1.5\",\"ageDescription^1.5\",\"taskName^1.5\",\"baseInfo.tableName^1.5\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"baseInfo.idCard^1.8\",\"cameraAddr^1.0\"]," +
"\"type\":\"cross_fields\",\"operator\":\"OR\",\"slop\":0,\"prefix_length\":0,\"max_expansions\":50,\"zero_terms_query\":\"NONE\",\"auto_generate_synonyms_phrase_query\":true,\"fuzzy_transpositions\":true,\"boost\":1}}],"
}
gteDate := searchBody["searchTime"].([]interface{})[0].(string)
@@ -116,13 +117,13 @@
isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
}
//鍒ゆ柇甯冮槻绛夌骇id
- alarmLevelId :=searchBody["alarmlevel"].([]interface{})
+ alarmLevelId := searchBody["alarmlevel"].([]interface{})
alarmLevelStr := ""
if len(alarmLevelId) > 0 {
alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
}
-
+
//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
//璇锋眰澶�
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
--
Gitblit v1.8.0