From 4c7890a506f95bfc8d06a75dbf6150bb8fcad1bb Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 28 九月 2019 15:28:32 +0800
Subject: [PATCH] add logger
---
controllers/esSearch.go | 199 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 165 insertions(+), 34 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 5e6a0fd..5d4e72b 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -1,16 +1,19 @@
-package controllers
+ package controllers
-import (
- "fmt"
- "strconv"
- "strings"
-
- "github.com/gin-gonic/gin"
- "webserver/extend/code"
- "webserver/extend/config"
- "webserver/extend/esutil"
- "webserver/extend/util"
-)
+ import (
+ "basic.com/dbapi.git"
+ "fmt"
+ "github.com/gin-gonic/gin"
+ "strconv"
+ "strings"
+ "webserver/cache"
+ "webserver/extend/code"
+ "webserver/extend/config"
+ "webserver/extend/esutil"
+ "basic.com/valib/logger.git"
+ "webserver/extend/util"
+ "webserver/models"
+ )
type EsSearchController struct{}
@@ -24,84 +27,212 @@
// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
// @Router /data/api-v/es/esSearch [POST]
func (sc *EsSearchController) PostEsSearch(c *gin.Context) {
- searchBody := make(map[string]interface{}, 0)
+ //searchBody := make(map[string]interface{}, 0)
+ //c.BindJSON(&searchBody)
+ //data := findEsData(searchBody)
- c.BindJSON(&searchBody)
+ var arg models.EsSearch
+ err := c.BindJSON(&arg)
+ if err !=nil || arg.Page <=0 && arg.Size<=0 {
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+ data := findEsData(&arg)
- data := findEsData(searchBody)
util.ResponseFormat(c, code.Success, data)
}
-func findEsData(searchBody map[string]interface{}) map[string]interface{} {
- webPage := int(searchBody["page"].(float64))
+//鑾峰彇鐩戞帶绛夌骇
+func getAlarmLevel(alarmlevel []int32) []string {
+ d := dbapi.DicApi{}
+ res, data := d.FindByType("ALARMLEVEL")
+ if data == nil {
+ logger.Debug("data is nil")
+ }
+ logger.Debug(res)
+ // logger.Debug(data)
+ 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"])
+ 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[int32(vl)] = name
+ }
+ alarmLevelRes := make([]string, len(alarmlevel))
+ for i, v := range alarmlevel {
+ if v < 0 {
+ alarmLevelRes[i] = "鎾ら槻"
+ } else {
+ alarmLevelRes[i] = alarmLevel[v]
+ }
+ }
+ return alarmLevelRes
+}
- webSize := int(searchBody["size"].(float64))
+func findEsData(searchBody *models.EsSearch) map[string]interface{} {
+ webPage := searchBody.Page
+
+ webSize := searchBody.Size
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)
+ queryBody := searchBody.InputValue
//妫�绱㈡
if queryBody != "" {
- queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"alarmRules.alarmLevel^1.5\",\"ageDescription^1.5\",\"taskName^1.5\",\"tableName^1.5\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"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\",\"alarmRules.linkInfo^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
+ if searchTime == nil || len(searchTime) < 2 {
+ info := make(map[string]interface{}, 0)
+ info["err"] = "璇疯緭鍏ユ椂闂磋寖鍥�"
+ return info
+ }
+
+ gteDate := searchTime[0]
+ lteDate := searchTime[1]
+
+ //鍒ゆ柇浜哄憳ID
+ personIdStr := ""
+ //personId := searchBody.Id
+ personId := []string{}
+ if personId != nil && len(personId) > 0 {
+ esPersonId := strings.Replace(strings.Trim(fmt.Sprint(personId), "[]"), " ", "\",\"", -1)
+ personIdStr = "{\"terms\":{\"id\":[\"" + esPersonId + "\"]}},"
+ }
+
//鍒ゆ柇浠诲姟ID
taskIdStr := ""
- taskId := searchBody["tasks"].([]interface{})
+ taskId := searchBody.Tasks
if taskId != nil && len(taskId) > 0 {
esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
}
+
//鍒ゆ柇鎽勫儚鏈篒D
cameraIdStr := ""
- cameraId := searchBody["treeNodes"].([]interface{})
+ cameraId := searchBody.TreeNodes
if cameraId != nil && len(cameraId) > 0 {
esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
}
//鍒ゆ柇搴撹〃ID
- tableId := searchBody["tabs"].([]interface{})
+ tableId := searchBody.Tabs
esTableId := ""
esTableIdStr := ""
if tableId != nil && len(tableId) > 0 {
esTableId = strings.Replace(strings.Trim(fmt.Sprint(tableId), "[]"), " ", "\",\"", -1)
index = config.EsInfo.EsIndex.VideoPersons.IndexName
- esTableIdStr = "{\"terms\":{\"tableId\":[\"" + esTableId + "\"]}},"
+ esTableIdStr = "{\"terms\":{\"baseInfo.tableId\":[\"" + esTableId + "\"]}},"
}
+ //鍒ゆ柇鏀惰棌鐘舵��
isCollectStr := ""
- isCollect := searchBody["collection"].(string)
+ isCollect := searchBody.Collection
if isCollect != "" {
isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
+ }
+ //鍒ゆ柇甯冮槻绛夌骇id
+ alarmLevelId := searchBody.AlarmLevel
+ 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 +
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ logger.Debug("localConfig is wrong!!!")
+ return nil
+ }
+ url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + index + "/_search?search_type=dfs_query_then_fetch"
+
+ analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
+
//璇锋眰浣�
prama := "{\"from\":\"" + from + "\"," +
"\"size\":\"" + size + "\"," +
"\"query\":{\"bool\":{" + queryStr +
"\"filter\":[" +
cameraIdStr +
+ alarmLevelStr +
+ personIdStr +
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{} {
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ logger.Debug("localConfig is wrong!!!")
+ return nil
+ }
+ url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
+ "/" + 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\"]" +
@@ -119,7 +250,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{})
@@ -141,7 +272,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