From e83dc9c5ecbcc4f97da67f6fb5a1a352e0c9efb9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 08 七月 2019 19:36:01 +0800
Subject: [PATCH] gb28181set
---
controllers/monitoring.go | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/controllers/monitoring.go b/controllers/monitoring.go
index 6292953..4bae956 100644
--- a/controllers/monitoring.go
+++ b/controllers/monitoring.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "basic.com/dbapi.git"
"fmt"
"strings"
@@ -43,10 +44,15 @@
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + index + "/_search"
+ var setApi dbapi.SysSetApi
+ _, sysconf := setApi.GetServerInfo()
+ analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}},"
+
prama := "{\"query\":{\"bool\":{\"filter\":[" +
cameraIdStr +
taskIdStr +
- "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5s\",\"lt\":\"now+8h\"}}}]}}," +
+ analyServerFilterStr +
+ "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5000s\",\"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\",\"cameraId\"]}"
--
Gitblit v1.8.0