From 73ed18c9f59ae4adc545731977c1ce3a5c26b3f7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 06 八月 2019 11:20:17 +0800
Subject: [PATCH] add log
---
controllers/monitoring.go | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/controllers/monitoring.go b/controllers/monitoring.go
index 6292953..209f66f 100644
--- a/controllers/monitoring.go
+++ b/controllers/monitoring.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "basic.com/dbapi.git"
"fmt"
"strings"
@@ -15,7 +16,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}"
@@ -25,7 +26,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 {
@@ -33,7 +34,7 @@
cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
}
//鍒ゆ柇浠诲姟ID
- taskIdStr := ""
+ taskIdStr := "{\"terms\":{\"taskId\":[]}},"
taskId := searchBody["tasks"].([]interface{})
if taskId != nil && len(taskId) > 0 {
esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
@@ -43,14 +44,20 @@
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 +
- "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5s\",\"lt\":\"now+8h\"}}}]}}," +
+ analyServerFilterStr +
+ "{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}]}}," +
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"1000\"," +
- "\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"sdkType\",\"ageDescription\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"cameraId\"]}"
+ "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
fmt.Println(prama)
+ fmt.Println(url)
tokenRes := esutil.GetEsDataReq(url, prama, true)
/* for _, value := range tokenRes["datalist"].([]interface{}) {
if value.(map[string]interface{})["personId"] != nil {
--
Gitblit v1.8.0