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/monitoring.go | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/controllers/monitoring.go b/controllers/monitoring.go
index ccb3519..d18673a 100644
--- a/controllers/monitoring.go
+++ b/controllers/monitoring.go
@@ -29,42 +29,56 @@
var searchBody InitForMonitorArg
c.BindJSON(&searchBody)
- index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
+ index := config.EsInfo.EsIndex.AiOcean.IndexName
cameraIdStr := ""
+ linkTagInfoCameraIdStr := ""
cameraId := searchBody.TreeNodes
if cameraId != nil && len(cameraId) > 0 {
esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
+ linkTagInfoCameraIdStr = "{\"terms\":{\"linkTagInfo.cameraId\":[\"" + esCameraId + "\"]}},"
}
//鍒ゆ柇浠诲姟ID
- taskIdStr := "{\"terms\":{\"taskId\":[]}},"
+ taskIdStr := ""
+ linkTagInfoTaskIdStr := ""
taskId := searchBody.Tasks
if taskId != nil && len(taskId) > 0 {
esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
+ linkTagInfoTaskIdStr = "{\"terms\":{\"linkTagInfo.taskId\":[\"" + esTaskId + "\"]}},"
}
//璇锋眰澶�
localConf, err2 := cache.GetServerInfo()
- if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ if err2 != nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
logger.Debug("localConfig is wrong!!!")
- util.ResponseFormat(c,code.ComError,"localConf wrong")
+ util.ResponseFormat(c, code.ComError, "localConf wrong")
return
}
url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + index + "/_search"
analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
+ linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}},"
- prama := "{\"query\":{\"bool\":{\"filter\":[" +
+ prama := "{\"query\":{\"bool\":{\"should\":[" +
+ "{\"bool\":{\"filter\":[" +
cameraIdStr +
taskIdStr +
analyServerFilterStr +
- "{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}]}}," +
+ "{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
+ "]}}," +
+ "{\"bool\":{\"filter\":[" +
+ linkTagInfoCameraIdStr +
+ linkTagInfoTaskIdStr +
+ linkTagInfoAnalyServerFilterStr +
+ "{\"range\":{\"linkTagInfo.picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
+ "]}}" +
+ "],\"minimum_should_match\":1}}," +
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"1000\"," +
- "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
- fmt.Println(prama)
- fmt.Println(url)
+ "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"
+ logger.Debug("monitor param:", prama)
+ logger.Debug("monitor url:", url)
tokenRes := esutil.GetEsDataReq(url, prama, true)
/* for _, value := range tokenRes["datalist"].([]interface{}) {
if value.(map[string]interface{})["personId"] != nil {
@@ -74,5 +88,6 @@
}
}
}*/
- util.ResponseFormat(c, code.Success, tokenRes)
+ tmpAllDate := esutil.ResponseData(tokenRes)
+ util.ResponseFormat(c, code.Success, tmpAllDate)
}
--
Gitblit v1.8.0