From c08fbcd91ea8cb75654d09f04ae4a645f321d7a0 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期五, 02 八月 2019 10:09:24 +0800
Subject: [PATCH] add linkId query
---
service/EnableStatusControlService.go | 4 ++--
controllers/esSearch.go | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 1c20631..c272cdc 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -152,12 +152,58 @@
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\"]" +
"}"
//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 = append(sources, 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
+ sources = append(sources, slaveInfo)
+ }
+ fmt.Println(linkInfo)
+
+ }
+ tmpDate["datalist"] = append(tmpDate["datalist"], sources)
+
+ fmt.Println(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\"]" +
diff --git a/service/EnableStatusControlService.go b/service/EnableStatusControlService.go
index a7dae12..7e0f303 100644
--- a/service/EnableStatusControlService.go
+++ b/service/EnableStatusControlService.go
@@ -17,7 +17,7 @@
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/_search"
var setApi dbapi.SysSetApi
_, sysconf := setApi.GetServerInfo()
- jsonDsl := `{
+ jsonDSL := `{
"query": {
"bool": {
"filter": [{
@@ -36,7 +36,7 @@
"size": 10000
}
`
- buf, err := esutil.EsReq("POST", url, []byte(jsonDsl))
+ buf, err := esutil.EsReq("POST", url, []byte(jsonDSL))
if err != nil {
logger.Debug(err)
}
--
Gitblit v1.8.0