From d94f80d854d09e89715ca7c2361cd6057f98f396 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期三, 31 七月 2019 17:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/initForData.go | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/controllers/initForData.go b/controllers/initForData.go
index 6838ddd..8999776 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -30,11 +30,14 @@
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + index + "/_search"
cameraIdStr := ""
- cameraId := searchBody["treeNodes"].([]interface{})
- if cameraId != nil && len(cameraId) > 0 {
- esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
- cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
+ if searchBody["treeNodes"] !=nil {
+ cameraId := searchBody["treeNodes"].([]interface{})
+ if cameraId != nil && len(cameraId) > 0 {
+ esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
+ cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
+ }
}
+
var setApi dbapi.SysSetApi
_, sysconf := setApi.GetServerInfo()
analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"
--
Gitblit v1.8.0