From 5e664037b47b68b1ba28e07cefcfcec2795fbeed Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 22 七月 2019 14:20:22 +0800
Subject: [PATCH] add initForCaptureData controller add initForMonitoringData controller fix capture fix monitoring
---
controllers/capture.go | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/controllers/capture.go b/controllers/capture.go
index d74d6ae..68dcf52 100644
--- a/controllers/capture.go
+++ b/controllers/capture.go
@@ -17,7 +17,7 @@
// @Description 瀹炴椂鎶撴媿鏁版嵁
// @Accept json
// @Produce json
-// @Tags es
+// @Tags realTime
// @Param obj body map true "搴曞簱鏁版嵁"
// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}"
// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
@@ -45,22 +45,11 @@
prama := "{\"query\":{\"bool\":{\"filter\":[" +
cameraIdStr +
analyServerFilterStr +
- "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5000s\",\"lt\":\"now+8h\"}}}]}}," +
+ "{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}]}}," +
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"1000\"," +
"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
fmt.Println(prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
- /*for _, value := range tokenRes["datalist"].([]interface{}) {
- if value.(map[string]interface{})["personId"] != nil {
- info := getDBPersonInfo(value.(map[string]interface{})["personId"].(string))
- for key, val := range info {
- //fmt.Println(value.(map[string]interface{})[key],val)
- value.(map[string]interface{})[key] = val
-
- }
- }
- }*/
-
util.ResponseFormat(c, code.Success, tokenRes)
}
--
Gitblit v1.8.0