From f851fa7727e4b2384bd5c32793bd58c07e55a53d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 12 十二月 2019 14:24:24 +0800
Subject: [PATCH] FindAllFile add page and size
---
controllers/initForData.go | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/controllers/initForData.go b/controllers/initForData.go
index 1bd75ab..4b11099 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -31,7 +31,7 @@
//searchBody := make(map[string]interface{}, 0)
var searchBody RealTimeArg
c.BindJSON(&searchBody)
- index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
+ index := config.EsInfo.EsIndex.AiOcean.IndexName
localConf, err2 := cache.GetServerInfo()
if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
logger.Debug("localConfig is wrong!!!")
@@ -41,23 +41,35 @@
url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + index + "/_search"
cameraIdStr := ""
+ linkTagInfoCameraIdStr := ""
if searchBody.TreeNodes !=nil {
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 + "\"]}},"
}
}
analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}}"
+ linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}}"
- prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isAlarm\":\"1\"}}," +
+ prama := "{\"query\":{\"bool\":{\"should\":[" +
+ "{\"bool\":{\"filter\":[" +
+ "{\"term\":{\"isAlarm\":true}}," +
cameraIdStr +
analyServerFilterStr +
- "]}},\"size\":\"20\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
- "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"isAlarm\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]" +
+ "]}}," +
+ "{\"bool\":{\"filter\":[" +
+ "{\"term\":{\"isAlarm\":true}}," +
+ linkTagInfoCameraIdStr +
+ linkTagInfoAnalyServerFilterStr +
+ "]}}" +
+ "]}}," +
+ "\"size\":\"20\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
+ "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
"}"
- //logger.Debug("InitForCaptureData:", prama)
+ logger.Debug("InitForCaptureData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
util.ResponseFormat(c, code.Success, tokenRes)
}
@@ -81,19 +93,23 @@
//searchBody := make(map[string]interface{}, 0)
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()
@@ -106,15 +122,23 @@
"/" + index + "/_search"
analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}}"
+ linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}}"
- prama := "{\"query\":{\"bool\":{\"filter\":[" +
- cameraIdStr +
+ prama := "{\"query\":{\"bool\":{\"should\":[" +
+ "{\"bool\":{\"filter\":[" +
taskIdStr +
+ cameraIdStr +
analyServerFilterStr +
+ "]}}," +
+ "{\"bool\":{\"filter\":[" +
+ linkTagInfoTaskIdStr +
+ linkTagInfoCameraIdStr +
+ linkTagInfoAnalyServerFilterStr +
+ "]}}" +
"]}}," +
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"20\"," +
- "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
+ "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"
//logger.Debug("url:", url)
//logger.Debug("InitForMonitoringData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
--
Gitblit v1.8.0