From 56c5e906cfe795773411df351dd90fcf216d58f7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 20 十一月 2019 16:58:38 +0800
Subject: [PATCH] update protomsg and change alarmLevel to string
---
controllers/initForData.go | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/controllers/initForData.go b/controllers/initForData.go
index 8d595d9..4b11099 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -1,7 +1,6 @@
package controllers
import (
- "basic.com/dbapi.git"
"basic.com/valib/logger.git"
"fmt"
"github.com/gin-gonic/gin"
@@ -17,6 +16,7 @@
type InitForData struct {
}
+// @Security ApiKeyAuth
// @Summary 鎶撴媿瀹炴椂鍥炬暟鎹垵濮嬪寲
// @Description 瀹炴椂鑾峰彇鏁版嵁
// @Accept json
@@ -31,9 +31,9 @@
//searchBody := make(map[string]interface{}, 0)
var searchBody RealTimeArg
c.BindJSON(&searchBody)
- index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
+ index := config.EsInfo.EsIndex.AiOcean.IndexName
localConf, err2 := cache.GetServerInfo()
- if err2 !=nil || localConf.AlarmIp == "" {
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
logger.Debug("localConfig is wrong!!!")
util.ResponseFormat(c,code.ComError,"localConf wrong")
return
@@ -41,25 +41,35 @@
url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + index + "/_search"
cameraIdStr := ""
+ linkTagInfoCameraIdStr := ""
if searchBody.TreeNodes !=nil {
cameraId := searchBody.TreeNodes
if cameraId != nil && len(cameraId) > 0 {
esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
+ linkTagInfoCameraIdStr = "{\"terms\":{\"linkTagInfo.cameraId\":[\"" + esCameraId + "\"]}},"
}
}
- var setApi dbapi.SysSetApi
- _, sysconf := setApi.GetServerInfo()
- analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"
+ analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}}"
+ linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}}"
- prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isAlarm\":\"1\"}}," +
+ prama := "{\"query\":{\"bool\":{\"should\":[" +
+ "{\"bool\":{\"filter\":[" +
+ "{\"term\":{\"isAlarm\":true}}," +
cameraIdStr +
analyServerFilterStr +
- "]}},\"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\"]" +
+ "]}}," +
+ "{\"bool\":{\"filter\":[" +
+ "{\"term\":{\"isAlarm\":true}}," +
+ linkTagInfoCameraIdStr +
+ linkTagInfoAnalyServerFilterStr +
+ "]}}" +
+ "]}}," +
+ "\"size\":\"20\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
+ "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
"}"
- //logger.Debug("InitForCaptureData:", prama)
+ logger.Debug("InitForCaptureData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
util.ResponseFormat(c, code.Success, tokenRes)
}
@@ -69,6 +79,7 @@
Tasks []string `json:"tasks"`
}
+// @Security ApiKeyAuth
// @Summary 瀹炴椂浠诲姟鐩戞帶鏁版嵁鍒濆鍖�
// @Description 瀹炴椂鐩戞帶姣斿鏁版嵁
// @Accept json
@@ -82,41 +93,52 @@
//searchBody := make(map[string]interface{}, 0)
var searchBody InitForMonitorArg
c.BindJSON(&searchBody)
- index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
+ index := config.EsInfo.EsIndex.AiOcean.IndexName
cameraIdStr := ""
+ linkTagInfoCameraIdStr := ""
cameraId := searchBody.TreeNodes
if cameraId != nil && len(cameraId) > 0 {
esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}},"
+ linkTagInfoCameraIdStr = "{\"terms\":{\"linkTagInfo.cameraId\":[\"" + esCameraId + "\"]}},"
}
//鍒ゆ柇浠诲姟ID
- taskIdStr := "{\"terms\":{\"taskId\":[]}},"
+ taskIdStr := ""
+ linkTagInfoTaskIdStr := ""
taskId := searchBody.Tasks
if taskId != nil && len(taskId) > 0 {
esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
+ linkTagInfoTaskIdStr = "{\"terms\":{\"linkTagInfo.taskId\":[\"" + esTaskId + "\"]}},"
}
//璇锋眰澶�
localConf, err2 := cache.GetServerInfo()
- if err2 !=nil || localConf.AlarmIp == "" {
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
logger.Debug("localConfig is wrong!!!")
util.ResponseFormat(c,code.ComError,"localConf wrong")
return
}
url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + index + "/_search"
- var setApi dbapi.SysSetApi
- _, sysconf := setApi.GetServerInfo()
- analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"
- prama := "{\"query\":{\"bool\":{\"filter\":[" +
- cameraIdStr +
+ analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}}"
+ linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}}"
+
+ prama := "{\"query\":{\"bool\":{\"should\":[" +
+ "{\"bool\":{\"filter\":[" +
taskIdStr +
+ cameraIdStr +
analyServerFilterStr +
+ "]}}," +
+ "{\"bool\":{\"filter\":[" +
+ linkTagInfoTaskIdStr +
+ linkTagInfoCameraIdStr +
+ linkTagInfoAnalyServerFilterStr +
+ "]}}" +
"]}}," +
"\"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\"]}"
+ "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"
//logger.Debug("url:", url)
//logger.Debug("InitForMonitoringData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
--
Gitblit v1.8.0