From 4a2eb6f75b11ccb95e67a6f1c3b7cdf5b2c14d0c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 03 七月 2019 10:39:00 +0800
Subject: [PATCH] only filter current analyServer es data
---
controllers/monitoring.go | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/controllers/monitoring.go b/controllers/monitoring.go
index d42fd60..4bae956 100644
--- a/controllers/monitoring.go
+++ b/controllers/monitoring.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "basic.com/dbapi.git"
"fmt"
"strings"
@@ -43,9 +44,14 @@
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 +
+ analyServerFilterStr +
"{\"range\":{\"picDate\":{\"gte\":\"now+8h-5000s\",\"lt\":\"now+8h\"}}}]}}," +
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"1000\"," +
--
Gitblit v1.8.0