From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 六月 2020 18:29:41 +0800
Subject: [PATCH] add refresh token to resp
---
controllers/esSearch.go | 100 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 46 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index ffad124..194b4d1 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -34,8 +34,8 @@
var arg models.EsSearch
err := c.BindJSON(&arg)
- if err !=nil || arg.Page <=0 && arg.Size<=0 {
- util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ if err != nil || arg.Page <= 0 && arg.Size <= 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
data := findEsData(&arg)
@@ -105,7 +105,7 @@
//鍒ゆ柇鏁版嵁ID
idStr := ""
- linkTagInfoIdStr :=""
+ linkTagInfoIdStr := ""
//personId := searchBody.Id
id := []string{}
if id != nil && len(id) > 0 {
@@ -158,14 +158,14 @@
linkTagInfoAlarmLevelStr := ""
if len(alarmLevelId) > 0 {
alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1)
- alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
- linkTagInfoAlarmLevelStr = "{\"terms\":{\"linkTagInfo.alarmRules.alarmLevel\":[\"" + alarmLevelTypes + "\"]}},"
+ alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
+ linkTagInfoAlarmLevelStr = "{\"terms\":{\"linkTagInfo.alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
}
//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
//璇锋眰澶�
localConf, err2 := cache.GetServerInfo()
- if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ if err2 != nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
logger.Debug("localConfig is wrong!!!")
return nil
}
@@ -188,7 +188,7 @@
isCollectStr +
esTableIdStr +
analyServerFilterStr +
- "{\"range\":{\"picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}"+
+ "{\"range\":{\"picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}" +
"]}}," +
"{\"bool\":{\"filter\":[" +
linkTagInfoCameraIdStr +
@@ -198,51 +198,59 @@
linkTagInfoIsCollectStr +
linkTagInfoEsTableIdStr +
linkTagInfoAnalyServerFilterStr +
- "{\"range\":{\"linkTagInfo.picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}"+
+ "{\"range\":{\"linkTagInfo.picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}" +
"]}}" +
- "]}}," +
- "\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," +
+ "],\"minimum_should_match\":1}}," +
+ "\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"updateTime\":{\"order\":\"desc\"}}]," +
"\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
"}"
- logger.Debug("findEsData.param:",prama)
+ logger.Debug("findEsData.param:", prama)
//鏁版嵁瑙ｆ瀽
tokenRes := esutil.GetEsDataReq(url, prama, true)
+ tmpAllDate := esutil.ResponseData(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)
-
- 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["activeObject"] = masterInfo
-
- tmpDate["datalist"] = append(tmpDate["datalist"], sources)
- }
- tmpAllDate["datalist"] = tmpDate["datalist"]
+ //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)
+ // activateInfo := make(map[string]interface{})
+ // 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...)
+ // for i, j := 0, len(slaveList)-1; i < j; i, j = i+1, j-1 {
+ // slaveList[i], slaveList[j] = slaveList[j], slaveList[i]
+ // }
+ // sources["list"] = slaveList
+ // activateInfo = slaveList[0].(map[string]interface{})
+ // } else {
+ // sources["list"] = []interface{}{
+ // masterInfo,
+ // }
+ // activateInfo = masterInfo
+ // }
+ // } else {
+ // if _, ok := masterInfo["linkTagInfo"]; ok {
+ // delete(masterInfo, "linkTagInfo")
+ // }
+ // sources["list"] = []interface{}{
+ // masterInfo,
+ // }
+ // activateInfo = masterInfo
+ //
+ // }
+ //
+ // sources["activeObject"] = activateInfo
+ //
+ // tmpDate["datalist"] = append(tmpDate["datalist"], sources)
+ //}
+ //tmpAllDate["datalist"] = tmpDate["datalist"]
return tmpAllDate
}
--
Gitblit v1.8.0