From 73ed18c9f59ae4adc545731977c1ce3a5c26b3f7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 06 八月 2019 11:20:17 +0800
Subject: [PATCH] add log
---
controllers/esSearch.go | 144 +++++++++++++++++++++++++++++++----------------
1 files changed, 94 insertions(+), 50 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index f430e2b..7e18927 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -5,6 +5,7 @@
"fmt"
"strconv"
"strings"
+ "webserver/extend/logger"
"github.com/gin-gonic/gin"
"webserver/extend/code"
@@ -32,33 +33,38 @@
data := findEsData(searchBody)
util.ResponseFormat(c, code.Success, data)
}
+
//鑾峰彇鐩戞帶绛夌骇
-func getAlarmLevel(alarmlevel []int) ([]string) {
+func getAlarmLevel(alarmlevel []interface{}) []string {
d := dbapi.DicApi{}
- res,data := d.FindByType("ALARMLEVEL")
- if data == nil {
- fmt.Println("dsadasd")
- }
- fmt.Println(res)
- // fmt.Println(data)
+ res, data := d.FindByType("ALARMLEVEL")
+ if data == nil {
+ logger.Debug("data is nil")
+ }
+ logger.Debug(res)
+ // logger.Debug(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
+ 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 {
- alarmLevelRes[i] = alarmLevel[v]
+ 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{} {
@@ -68,18 +74,26 @@
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 := ""
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)
- lteDate := searchBody["searchTime"].([]interface{})[1].(string)
+
+ searchTime := searchBody["searchTime"].([]interface{})
+ if searchBody["searchTime"] == nil || len(searchTime) < 2 {
+ info := make(map[string]interface{}, 0)
+ info["err"] = "璇疯緭鍏ユ椂闂磋寖鍥�"
+ return info
+ }
+
+ gteDate := searchTime[0].(string)
+ lteDate := searchTime[1].(string)
//鍒ゆ柇浠诲姟ID
taskIdStr := ""
taskId := searchBody["tasks"].([]interface{})
@@ -111,28 +125,13 @@
isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
}
//鍒ゆ柇甯冮槻绛夌骇id
- alarmLevelId :=searchBody["alarmlevel"].([]interface{})
+ alarmLevelId := searchBody["alarmlevel"].([]interface{})
alarmLevelStr := ""
- defenceStateStr = ""
if len(alarmLevelId) > 0 {
- flag := false
- for i,v := range alarmLevelId {
- if v == -1 {
- alarmLevelId = append(alarmLevel[:i], alarmLevel[i+1:]...)
- defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":false}},"
- flag = true
- breake
- }
- }
- if len(alarmLevelId) > 0{
- if flag == false {
- defenceStateStr = "{\"term\":{\"alarmRules.defenceState\":true}},"
- }
- id := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevel)), "[]"), " ", "\",\"", -1)
- alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + id + "\"]}},"
- }
+ alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
+ alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
}
-
+
//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
//璇锋眰澶�
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
@@ -148,19 +147,64 @@
"\"filter\":[" +
cameraIdStr +
alarmLevelStr +
- defenceStateStr +
taskIdStr +
isCollectStr +
esTableIdStr +
analyServerFilterStr +
"{\"range\":{\"picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}]}}," +
"\"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\"]" +
+ "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\",\"linkId\"]" +
"}"
- fmt.Println(prama)
+ //logger.Debug("findEsData.param:",prama)
//鏁版嵁瑙ｆ瀽
tokenRes := esutil.GetEsDataReq(url, prama, true)
- return tokenRes
+ //fmt.Println(tokenRes)
+ tmpAllDate := make(map[string]interface{})
+ tmpDate := make(map[string][]interface{})
+ tmpAllDate["total"] = tokenRes["total"]
+ data := tokenRes["datalist"]
+ for _, masterInfoValues := range data.([]interface{}) {
+ masterInfo := masterInfoValues.(map[string]interface{})
+ sources := make(map[string]interface{}, 0)
+ sources["activeObject"] = masterInfo
+ source := make([]map[string]interface{}, 0)
+ source = append(source, masterInfo)
+ linkId := ""
+ if masterInfo["linkId"] != nil {
+ linkId = masterInfo["linkId"].(string)
+ }
+ id := masterInfo["id"].(string)
+ if linkId != "" {
+ linkInfo := GetLinkInfo(linkId, id)
+ for _, slaveInfoValues := range linkInfo {
+ slaveInfo := slaveInfoValues
+ source = append(source, slaveInfo)
+ }
+
+ }
+ sources["list"] = source
+ tmpDate["datalist"] = append(tmpDate["datalist"], sources)
+ }
+ tmpAllDate["datalist"] = tmpDate["datalist"]
+ return tmpAllDate
+}
+
+func GetLinkInfo(linkId string, id string) []map[string]interface{} {
+ url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
+ "/" + config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName + "/_search?search_type=dfs_query_then_fetch"
+ jsonDSL := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"linkId.keyword\":\"" + linkId + "\"}}],\"must_not\":[{\"term\":{\"_id\":\"" + id + "\"}}]}},\"size\":100}"
+
+ buf, err := esutil.EsReq("POST", url, []byte(jsonDSL))
+ if err != nil {
+ logger.Debug(err)
+ }
+
+ sources, err := esutil.Sourcelist(buf)
+ if err != nil {
+ logger.Debug(err)
+ }
+ return sources
+
}
//sdkTYype瀛楀吀"\"_source\":[\"BaseName\",\"Gender\",\"Race\",\"content\",\"idcard\",\"picAddress\",\"picDate\",\"sdkType\",\"Age\",\"personId\",\"personIsHub\",\"personPicUrl\",\"picLocalUrl\",\"picSmUrl\",\"videoIp\",\"videoNum\",\"cameraId\",\"ageDescription\",\"likePer\"]" +
@@ -178,7 +222,7 @@
tokenRes := esutil.GetEsDataReq(url, prama, true)
personRes := make(map[string]string)
- //fmt.Println(tokenRes["datalist"].([]interface{}))
+ //logger.Debug(tokenRes["datalist"].([]interface{}))
result := tokenRes["datalist"].([]interface{})
for _, value := range result {
userMap := value.(map[string]interface{})
@@ -200,7 +244,7 @@
// personRes["phoneNum"] = value.(map[string]interface{})["phoneNum"].(string)
// personRes["sex"] = value.(map[string]interface{})["sex"].(string)
}
- //fmt.Println(personRes)
+ //logger.Debug(personRes)
if len(personRes) < 1 {
personRes["personName"] = ""
personRes["phoneNum"] = ""
--
Gitblit v1.8.0