From 41ac67f13587ff76631167d6050c3f27f7b97c2a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 15 十月 2019 18:55:21 +0800
Subject: [PATCH] rm no use config

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

diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 3e85590..84e2ef0 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -6,10 +6,11 @@
 		"github.com/gin-gonic/gin"
 		"strconv"
 		"strings"
+		"webserver/cache"
 		"webserver/extend/code"
 		"webserver/extend/config"
 		"webserver/extend/esutil"
-		"webserver/extend/logger"
+		"basic.com/valib/logger.git"
 		"webserver/extend/util"
 		"webserver/models"
 	)
@@ -42,7 +43,7 @@
 }
 
 //鑾峰彇鐩戞帶绛夌骇
-func getAlarmLevel(alarmlevel []string) []string {
+func getAlarmLevel(alarmlevel []int32) []string {
 	d := dbapi.DicApi{}
 	res, data := d.FindByType("ALARMLEVEL")
 	if data == nil {
@@ -50,7 +51,7 @@
 	}
 	logger.Debug(res)
 	// logger.Debug(data)
-	alarmLevel := make(map[int]string)
+	alarmLevel := make(map[int32]string)
 	tmp := data.(map[string]interface{})
 	for _, value := range tmp["ALARMLEVEL"].([]interface{}) {
 		// logger.Debug(value.(map[string]interface{})["value"],"		",value.(map[string]interface{})["name"])
@@ -60,15 +61,14 @@
 		if err != nil {
 			logger.Debug(err)
 		}
-		alarmLevel[vl] = name
+		alarmLevel[int32(vl)] = name
 	}
 	alarmLevelRes := make([]string, len(alarmlevel))
 	for i, v := range alarmlevel {
-		value,_ := strconv.Atoi(v)
-		if value < 0 {
+		if v < 0 {
 			alarmLevelRes[i] = "鎾ら槻"
 		} else {
-			alarmLevelRes[i] = alarmLevel[value]
+			alarmLevelRes[i] = alarmLevel[v]
 		}
 	}
 	return alarmLevelRes
@@ -88,7 +88,7 @@
 	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\":[\"baseInfo.sex\",\"baseInfo.phoneNum.raw^1.5\",\"baseInfo.personName.raw^1.5\",\"alarmRules.alarmLevel^1.5\",\"alarmRules.linkInfo^3.0\",\"ageDescription^1.5\",\"taskName^1.5\",\"baseInfo.tableName^1.0\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"baseInfo.idCard^1.8\",\"cameraAddr^2.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}}],"
 	}
 
@@ -101,6 +101,16 @@
 
 	gteDate := searchTime[0]
 	lteDate := searchTime[1]
+
+	//鍒ゆ柇浜哄憳ID
+	personIdStr := ""
+	//personId := searchBody.Id
+	personId := []string{}
+	if personId != nil && len(personId) > 0 {
+		esPersonId := strings.Replace(strings.Trim(fmt.Sprint(personId), "[]"), " ", "\",\"", -1)
+		personIdStr = "{\"terms\":{\"id\":[\"" + esPersonId + "\"]}},"
+	}
+
 	//鍒ゆ柇浠诲姟ID
 	taskIdStr := ""
 	taskId := searchBody.Tasks
@@ -108,6 +118,7 @@
 		esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
 		taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
 	}
+
 	//鍒ゆ柇鎽勫儚鏈篒D
 	cameraIdStr := ""
 	cameraId := searchBody.TreeNodes
@@ -141,11 +152,15 @@
 
 	//浣跨敤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 + "\"}},"
 
 	//璇锋眰浣�
 	prama := "{\"from\":\"" + from + "\"," +
@@ -154,6 +169,7 @@
 		"\"filter\":[" +
 		cameraIdStr +
 		alarmLevelStr +
+		personIdStr +
 		taskIdStr +
 		isCollectStr +
 		esTableIdStr +
@@ -197,9 +213,14 @@
 }
 
 func GetLinkInfo(linkId string, id string) []map[string]interface{} {
-	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)) +
 		"/" + 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\":\"" + linkId + "\"}}],\"must_not\":[{\"term\":{\"id\":\"" + id + "\"}}]}},\"size\":100}"
 
 	buf, err := esutil.EsReq("POST", url, []byte(jsonDSL))
 	if err != nil {

--
Gitblit v1.8.0