From 0222e79afe45d9fc55aed9a7e62ca239c228ab73 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 23 十二月 2019 10:24:12 +0800
Subject: [PATCH] add sys comeback sh
---
controllers/monitoring.go | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/controllers/monitoring.go b/controllers/monitoring.go
index 8586698..7741c00 100644
--- a/controllers/monitoring.go
+++ b/controllers/monitoring.go
@@ -14,6 +14,7 @@
"webserver/extend/util"
)
+// @Security ApiKeyAuth
// @Summary 瀹炴椂鐩戞帶
// @Description 瀹炴椂鐩戞帶姣斿鏁版嵁
// @Accept json
@@ -28,19 +29,23 @@
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()
@@ -53,17 +58,27 @@
"/" + 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\"}}}" +
+ "]}}" +
+ "]}}," +
"\"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 {
--
Gitblit v1.8.0