From f4e8f206a6760bdc31734dfcb1c65916b5b76311 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 22 八月 2019 12:05:58 +0800
Subject: [PATCH] add cluster
---
controllers/esSearch.go | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index c272cdc..c9e5ec6 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -1,4 +1,4 @@
-package controllers
+ package controllers
import (
"basic.com/dbapi.git"
@@ -81,9 +81,10 @@
queryBody := searchBody["inputValue"].(string)
//妫�绱㈡
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\",\"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\":[\"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}}],"
}
+
searchTime := searchBody["searchTime"].([]interface{})
if searchBody["searchTime"] == nil || len(searchTime) < 2 {
info := make(map[string]interface{}, 0)
@@ -157,15 +158,17 @@
//logger.Debug("findEsData.param:",prama)
//鏁版嵁瑙ｆ瀽
tokenRes := esutil.GetEsDataReq(url, prama, true)
- fmt.Println(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)
+ 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)
@@ -175,14 +178,12 @@
linkInfo := GetLinkInfo(linkId, id)
for _, slaveInfoValues := range linkInfo {
slaveInfo := slaveInfoValues
- sources = append(sources, slaveInfo)
+ source = append(source, slaveInfo)
}
- fmt.Println(linkInfo)
}
+ sources["list"] = source
tmpDate["datalist"] = append(tmpDate["datalist"], sources)
-
- fmt.Println(sources)
}
tmpAllDate["datalist"] = tmpDate["datalist"]
return tmpAllDate
@@ -191,7 +192,7 @@
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}"
+ 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 {
--
Gitblit v1.8.0