From 7fbcb59ef13802542c3cf036a94875259729b975 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 25 六月 2019 20:13:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/monitoring.go | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/controllers/monitoring.go b/controllers/monitoring.go
index 6dc8bb4..6292953 100644
--- a/controllers/monitoring.go
+++ b/controllers/monitoring.go
@@ -26,11 +26,11 @@
c.BindJSON(&searchBody)
index := config.EsInfo.EsIndex.VideoPersons.IndexName
- videoReqNumStr := ""
- videoReqNum := searchBody["treeNodes"].([]interface{})
- if videoReqNum != nil && len(videoReqNum) > 0 {
- esVideoReqNum := strings.Replace(strings.Trim(fmt.Sprint(videoReqNum), "[]"), " ", "\",\"", -1)
- videoReqNumStr = "{\"terms\":{\"videoReqNum\":[\"" + esVideoReqNum + "\"]}},"
+ cameraIdStr := ""
+ cameraId := searchBody["treeNodes"].([]interface{})
+ if cameraId != nil && len(cameraId) > 0 {
+ esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
+ cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
}
//鍒ゆ柇浠诲姟ID
taskIdStr := ""
@@ -44,12 +44,12 @@
"/" + index + "/_search"
prama := "{\"query\":{\"bool\":{\"filter\":[" +
- videoReqNumStr +
+ cameraIdStr +
taskIdStr +
"{\"range\":{\"picDate\":{\"gte\":\"now+8h-5s\",\"lt\":\"now+8h\"}}}]}}," +
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"1000\"," +
- "\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"sdkType\",\"ageDescription\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"videoReqNum\"]}"
+ "\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"sdkType\",\"ageDescription\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"cameraId\"]}"
fmt.Println(prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
/* for _, value := range tokenRes["datalist"].([]interface{}) {
--
Gitblit v1.8.0