From c4c73a384c1a02c26c81b0a76bb1d10062e64cb4 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 14 十一月 2019 17:28:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/webserver

---
 controllers/esSearch.go |   63 ++++++++++++-------------------
 1 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index bd08e48..1d4dcdb 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -177,7 +177,7 @@
 		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\",\"linkId\"]" +
+		"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"isAlarm\",\"analyServerIp\",\"cameraId\",\"linkTag\",\"linkTagInfo\"]" +
 		"}"
 	//logger.Debug("findEsData.param:",prama)
 	//鏁版嵁瑙f瀽
@@ -190,50 +190,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{} {
-	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\":\"" + 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