From f3863b12653fc47996073710b56e792de0be4c8d Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 25 六月 2019 17:57:05 +0800
Subject: [PATCH] 根据新索引结构修改算法和接口

---
 controllers/esSearch.go |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index d4dca24..9feb959 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -46,7 +46,7 @@
 	queryBody := searchBody["inputValue"].(string)
 	//妫�绱㈡
 	if queryBody != "" {
-		queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"BaseName^1.5\",\"Gender^2.0\",\"Race^2.0\",\"content^1.0\",\"idcard^1.8\",\"picAddress^1.0\"]," +
+		queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"tableName^1.5\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"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)
@@ -59,11 +59,11 @@
 		taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
 	}
 	//鍒ゆ柇鎽勫儚鏈篒D
-	videoReqNumStr := ""
-	videoReqNum := searchBody["treeNodes"].([]interface{})
-	if videoReqNum != nil && len(videoReqNum) > 0 {
-		esVideoReqNum := strings.Replace(strings.Trim(fmt.Sprint(videoReqNum), "[]"), " ", "\",\"", -1)
-		videoReqNumStr = "{\"terms\":{\"videoReqNum\":[\"" + esVideoReqNum + "\"]}},"
+	cameraIdStr := ""
+	cameraId := searchBody["treeNodes"].([]interface{})
+	if cameraId != nil && len(cameraId) > 0 {
+		esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
+		cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
 	}
 
 	//鍒ゆ柇搴撹〃ID
@@ -75,10 +75,10 @@
 		index = config.EsInfo.EsIndex.VideoPersons.IndexName
 		esTableIdStr = "{\"terms\":{\"tableId\":[\"" + esTableId + "\"]}},"
 	}
-	collectionStr := ""
-	collection := searchBody["collection"].(string)
-	if collection != "" {
-		collectionStr = "{\"term\":{\"collection\":\"" + collection + "\"}},"
+	isCollectStr := ""
+	isCollect := searchBody["collection"].(string)
+	if isCollect != "" {
+		isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
 	}
 
 	//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
@@ -90,13 +90,13 @@
 		"\"size\":\"" + size + "\"," +
 		"\"query\":{\"bool\":{" + queryStr +
 		"\"filter\":[" +
-		videoReqNumStr +
+		cameraIdStr +
 		taskIdStr +
-		collectionStr +
+		isCollectStr +
 		esTableIdStr +
 		"{\"range\":{\"picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}]}}," +
 		"\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," +
-		"\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"sdkType\",\"ageDescription\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"videoReqNum\"]" +
+		"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]" +
 		"}"
 	fmt.Println(prama)
 	//鏁版嵁瑙f瀽
@@ -104,7 +104,7 @@
 	return tokenRes
 }
 
-//sdkTYype瀛楀吀"\"_source\":[\"BaseName\",\"Gender\",\"Race\",\"content\",\"idcard\",\"picAddress\",\"picDate\",\"sdkType\",\"Age\",\"personId\",\"personIsHub\",\"personPicUrl\",\"picLocalUrl\",\"picSmUrl\",\"videoIp\",\"videoNum\",\"videoReqNum\",\"ageDescription\",\"likePer\"]" +
+//sdkTYype瀛楀吀"\"_source\":[\"BaseName\",\"Gender\",\"Race\",\"content\",\"idcard\",\"picAddress\",\"picDate\",\"sdkType\",\"Age\",\"personId\",\"personIsHub\",\"personPicUrl\",\"picLocalUrl\",\"picSmUrl\",\"videoIp\",\"videoNum\",\"cameraId\",\"ageDescription\",\"likePer\"]" +
 //func sdkTypeToValue(i int) string {
 //	value := []string{"浜鸿劯", "杞﹁締", "浜轰綋", "鍏ヤ镜", "鎷ユ尋", "闈犲彸琛�", "浜哄憳寮傚父", "涓綋闈欐"}
 //	return value[i-1]

--
Gitblit v1.8.0