From 0222e79afe45d9fc55aed9a7e62ca239c228ab73 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 23 十二月 2019 10:24:12 +0800
Subject: [PATCH] add sys comeback sh
---
controllers/esSearch.go | 153 +++++++++++++++++++++++++++++++--------------------
1 files changed, 93 insertions(+), 60 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 9172bac..161e1ac 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -1,21 +1,23 @@
- package controllers
+package controllers
- import (
- "basic.com/dbapi.git"
- "fmt"
- "github.com/gin-gonic/gin"
- "strconv"
- "strings"
- "webserver/extend/code"
- "webserver/extend/config"
- "webserver/extend/esutil"
- "basic.com/valib/logger.git"
- "webserver/extend/util"
- "webserver/models"
- )
+import (
+ "basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
+ "fmt"
+ "github.com/gin-gonic/gin"
+ "strconv"
+ "strings"
+ "webserver/cache"
+ "webserver/extend/code"
+ "webserver/extend/config"
+ "webserver/extend/esutil"
+ "webserver/extend/util"
+ "webserver/models"
+)
type EsSearchController struct{}
+// @Security ApiKeyAuth
// @Summary 妫�绱�
// @Description 淇℃伅妫�绱㈠拰姣斿妫�绱�
// @Accept json
@@ -82,12 +84,12 @@
//esSize := strconv.Itoa(webSize)
size := strconv.Itoa(webSize)
//璇锋眰绱㈠紩
- index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
+ index := config.EsInfo.EsIndex.AiOcean.IndexName
queryStr := ""
queryBody := searchBody.InputValue
//妫�绱㈡
if queryBody != "" {
- 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\"]," +
+ queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"cameraAddr^1.5\",\"taskName^1.5\",\"sdkName^1.5\",\"showLabels^3.0\",\"baseInfo.tableName^1.5\",\"baseInfo.targetName^1.5\",\"baseInfo.labels^1.5\",\"alarmRules.alarmLevel^1.5\",\"linkTag^1.5\",\"linkTagInfo.cameraAddr\",\"linkTagInfo.taskName^1.5\",\"linkTagInfo.sdkName^1.5\",\"linkTagInfo.showLabels^1.5\",\"linkTagInfo.baseInfo.tableName^1.5\",\"linkTagInfo.baseInfo.targetName^1.5\",\"linkTagInfo.baseInfo.labels^1.5\",\"linkTagInfo.alarmRules.alarmLevel^1.5\"]," +
"\"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}}],"
}
@@ -100,68 +102,109 @@
gteDate := searchTime[0]
lteDate := searchTime[1]
+
+ //鍒ゆ柇鏁版嵁ID
+ idStr := ""
+ linkTagInfoIdStr :=""
+ //personId := searchBody.Id
+ id := []string{}
+ if id != nil && len(id) > 0 {
+ esId := strings.Replace(strings.Trim(fmt.Sprint(id), "[]"), " ", "\",\"", -1)
+ idStr = "{\"terms\":{\"id\":[\"" + esId + "\"]}},"
+ linkTagInfoIdStr = "{\"terms\":{\"linkTagInfo.id\":[\"" + esId + "\"]}},"
+ }
+
//鍒ゆ柇浠诲姟ID
taskIdStr := ""
+ linkTagInfoTaskIdStr := ""
taskId := searchBody.Tasks
if taskId != nil && len(taskId) > 0 {
esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
+ linkTagInfoTaskIdStr = "{\"terms\":{\"linkTagInfo.taskId\":[\"" + esTaskId + "\"]}},"
}
+
//鍒ゆ柇鎽勫儚鏈篒D
cameraIdStr := ""
+ linkTagInfoCameraIdStr := ""
cameraId := searchBody.TreeNodes
if cameraId != nil && len(cameraId) > 0 {
esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
+ linkTagInfoCameraIdStr = "{\"terms\":{\"linkTagInfo.cameraId\":[\"" + esCameraId + "\"]}},"
}
//鍒ゆ柇搴撹〃ID
tableId := searchBody.Tabs
esTableId := ""
esTableIdStr := ""
+ linkTagInfoEsTableIdStr := ""
if tableId != nil && len(tableId) > 0 {
esTableId = strings.Replace(strings.Trim(fmt.Sprint(tableId), "[]"), " ", "\",\"", -1)
- index = config.EsInfo.EsIndex.VideoPersons.IndexName
esTableIdStr = "{\"terms\":{\"baseInfo.tableId\":[\"" + esTableId + "\"]}},"
+ linkTagInfoEsTableIdStr = "{\"terms\":{\"linkTagInfo.baseInfo.tableId\":[\"" + esTableId + "\"]}},"
}
//鍒ゆ柇鏀惰棌鐘舵��
isCollectStr := ""
+ linkTagInfoIsCollectStr := ""
isCollect := searchBody.Collection
if isCollect != "" {
- isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
+ isCollectStr = "{\"term\":{\"isCollect\":" + isCollect + "}},"
+ linkTagInfoIsCollectStr = "{\"term\":{\"linkTagInfo.isCollect\":" + isCollect + "}},"
}
//鍒ゆ柇甯冮槻绛夌骇id
alarmLevelId := searchBody.AlarmLevel
alarmLevelStr := ""
+ linkTagInfoAlarmLevelStr := ""
if len(alarmLevelId) > 0 {
alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
- alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
+ alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
+ linkTagInfoAlarmLevelStr = "{\"terms\":{\"linkTagInfo.alarmRules.alarmLevel.raw\":[\"" + 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"
- var setApi dbapi.SysSetApi
- _, sysconf := setApi.GetServerInfo()
- analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}},"
+
+ analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
+ linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}},"
//璇锋眰浣�
prama := "{\"from\":\"" + from + "\"," +
"\"size\":\"" + size + "\"," +
"\"query\":{\"bool\":{" + queryStr +
- "\"filter\":[" +
+ "\"should\":[" +
+ "{\"bool\":{\"filter\":[" +
cameraIdStr +
alarmLevelStr +
+ idStr +
taskIdStr +
isCollectStr +
esTableIdStr +
analyServerFilterStr +
- "{\"range\":{\"picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}]}}," +
+ "{\"range\":{\"picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}"+
+ "]}}," +
+ "{\"bool\":{\"filter\":[" +
+ linkTagInfoCameraIdStr +
+ linkTagInfoAlarmLevelStr +
+ linkTagInfoIdStr +
+ linkTagInfoTaskIdStr +
+ linkTagInfoIsCollectStr +
+ linkTagInfoEsTableIdStr +
+ linkTagInfoAnalyServerFilterStr +
+ "{\"range\":{\"linkTagInfo.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\",\"linkId\"]" +
+ "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
"}"
- //logger.Debug("findEsData.param:",prama)
+ logger.Debug("findEsData.param:",prama)
//鏁版嵁瑙ｆ瀽
tokenRes := esutil.GetEsDataReq(url, prama, true)
//fmt.Println(tokenRes)
@@ -172,45 +215,35 @@
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)
- }
+ if masterInfo["linkTagInfo"] != nil {
+ linkTagInfo := masterInfo["linkTagInfo"].([]interface{})
+ delete(masterInfo, "linkTagInfo")
+ if len(linkTagInfo) >0 {
+ slaveList := make([]interface{}, 0)
+ slaveList = append(slaveList, masterInfo)
+ slaveList = append(slaveList, linkTagInfo...)
+ sources["list"] = slaveList
+ } else {
+ sources["list"] = []interface{}{
+ masterInfo,
+ }
+ }
+ } else {
+ if _,ok := masterInfo["linkTagInfo"];ok {
+ delete(masterInfo, "linkTagInfo")
+ }
+ sources["list"] = []interface{}{
+ masterInfo,
+ }
}
- sources["list"] = source
+
+ sources["activeObject"] = masterInfo
+
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\"]" +
--
Gitblit v1.8.0