From 11164b48c94572573b51c380894763008f6010f6 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期二, 30 七月 2019 17:15:46 +0800
Subject: [PATCH] delete EndTime omitempty
---
controllers/initForData.go | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/controllers/initForData.go b/controllers/initForData.go
index 9d902e0..4f96400 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -38,7 +38,7 @@
"]}},\"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\"]" +
"}"
- fmt.Println(prama)
+ //logger.Debug("InitForCaptureData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
util.ResponseFormat(c, code.Success, tokenRes)
}
@@ -57,7 +57,7 @@
searchBody := make(map[string]interface{}, 0)
c.BindJSON(&searchBody)
- index := config.EsInfo.EsIndex.VideoPersons.IndexName
+ index := config.EsInfo.EsIndex.VideoPersons.IndexName +","+config.EsInfo.EsIndex.Personaction.IndexName
cameraIdStr := ""
cameraId := searchBody["treeNodes"].([]interface{})
if cameraId != nil && len(cameraId) > 0 {
@@ -86,7 +86,8 @@
"\"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\"]}"
- fmt.Println(prama)
+ //logger.Debug("url:", url)
+ //logger.Debug("InitForMonitoringData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
util.ResponseFormat(c, code.Success, tokenRes)
}
\ No newline at end of file
--
Gitblit v1.8.0