From e87b04d7f9d6b25c858d421432bed5443f91b9df Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 16 九月 2019 11:10:34 +0800
Subject: [PATCH] update goffmpeg and capture
---
controllers/capture.go | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/controllers/capture.go b/controllers/capture.go
index 4f07eb7..de43401 100644
--- a/controllers/capture.go
+++ b/controllers/capture.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "basic.com/dbapi.git"
"fmt"
"github.com/gin-gonic/gin"
"strings"
@@ -12,23 +13,26 @@
type RealTimeController struct{}
+type RealTimeArg struct {
+ TreeNodes []string `json:"treeNodes"`
+}
+
// @Summary 瀹炴椂鎶撴媿
// @Description 瀹炴椂鎶撴媿鏁版嵁
// @Accept json
// @Produce json
-// @Tags es
-// @Param obj body map true "搴曞簱鏁版嵁"
+// @Tags realTime
+// @Param obj body controllers.RealTimeArg true "搴曞簱鏁版嵁"
// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}"
// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
// @Router /data/api-v/realTime/capture [POST]
//瀹炴椂鎶撴媿
func (rc *RealTimeController) PostCapture(c *gin.Context) {
- searchBody := make(map[string]interface{}, 0)
-
+ var searchBody RealTimeArg
c.BindJSON(&searchBody)
index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
cameraIdStr := ""
- cameraId := searchBody["treeNodes"].([]interface{})
+ cameraId := searchBody.TreeNodes
if cameraId != nil && len(cameraId) > 0 {
esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
@@ -37,24 +41,18 @@
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 +
- "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5000s\",\"lt\":\"now+8h\"}}}]}}," +
+ analyServerFilterStr +
+ "{\"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