From 4c7890a506f95bfc8d06a75dbf6150bb8fcad1bb Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 28 九月 2019 15:28:32 +0800
Subject: [PATCH] add logger
---
controllers/esSearch.go | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 411fe93..5d4e72b 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -6,10 +6,11 @@
"github.com/gin-gonic/gin"
"strconv"
"strings"
+ "webserver/cache"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
- "webserver/extend/logger"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
"webserver/models"
)
@@ -100,6 +101,16 @@
gteDate := searchTime[0]
lteDate := searchTime[1]
+
+ //鍒ゆ柇浜哄憳ID
+ personIdStr := ""
+ //personId := searchBody.Id
+ personId := []string{}
+ if personId != nil && len(personId) > 0 {
+ esPersonId := strings.Replace(strings.Trim(fmt.Sprint(personId), "[]"), " ", "\",\"", -1)
+ personIdStr = "{\"terms\":{\"id\":[\"" + esPersonId + "\"]}},"
+ }
+
//鍒ゆ柇浠诲姟ID
taskIdStr := ""
taskId := searchBody.Tasks
@@ -107,6 +118,7 @@
esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1)
taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}},"
}
+
//鍒ゆ柇鎽勫儚鏈篒D
cameraIdStr := ""
cameraId := searchBody.TreeNodes
@@ -140,11 +152,15 @@
//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
//璇锋眰澶�
- url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ logger.Debug("localConfig is wrong!!!")
+ return nil
+ }
+ url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + index + "/_search?search_type=dfs_query_then_fetch"
- var setApi dbapi.SysSetApi
- _, sysconf := setApi.GetServerInfo()
- analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}},"
+
+ analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
//璇锋眰浣�
prama := "{\"from\":\"" + from + "\"," +
@@ -153,6 +169,7 @@
"\"filter\":[" +
cameraIdStr +
alarmLevelStr +
+ personIdStr +
taskIdStr +
isCollectStr +
esTableIdStr +
@@ -196,7 +213,12 @@
}
func GetLinkInfo(linkId string, id string) []map[string]interface{} {
- url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ logger.Debug("localConfig is wrong!!!")
+ return nil
+ }
+ url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName + "/_search?search_type=dfs_query_then_fetch"
jsonDSL := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"linkId.keyword\":\"" + linkId + "\"}}],\"must_not\":[{\"term\":{\"id\":\"" + id + "\"}}]}},\"size\":100}"
--
Gitblit v1.8.0