From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 六月 2020 18:29:41 +0800
Subject: [PATCH] add refresh token to resp
---
controllers/initForData.go | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/controllers/initForData.go b/controllers/initForData.go
index c373d7d..abd5bbb 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -33,16 +33,16 @@
c.BindJSON(&searchBody)
index := config.EsInfo.EsIndex.AiOcean.IndexName
localConf, err2 := cache.GetServerInfo()
- if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ if err2 != nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
logger.Debug("localConfig is wrong!!!")
- util.ResponseFormat(c,code.ComError,"localConf wrong")
+ util.ResponseFormat(c, code.ComError, "localConf wrong")
return
}
url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + index + "/_search"
cameraIdStr := ""
linkTagInfoCameraIdStr := ""
- if searchBody.TreeNodes !=nil {
+ if searchBody.TreeNodes != nil {
cameraId := searchBody.TreeNodes
if cameraId != nil && len(cameraId) > 0 {
esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1)
@@ -56,28 +56,28 @@
prama := "{\"query\":{\"bool\":{\"should\":[" +
"{\"bool\":{\"filter\":[" +
- "{\"term\":{\"isAlarm\":\"1\"}}," +
+ "{\"term\":{\"isAlarm\":true}}," +
cameraIdStr +
analyServerFilterStr +
"]}}," +
"{\"bool\":{\"filter\":[" +
- "{\"term\":{\"isAlarm\":\"1\"}}," +
+ "{\"term\":{\"isAlarm\":true}}," +
linkTagInfoCameraIdStr +
linkTagInfoAnalyServerFilterStr +
"]}}" +
- "]}}," +
- "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
+ "],\"minimum_should_match\":1}}," +
"\"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)
+ tmpAllDate := esutil.ResponseData(tokenRes)
+ util.ResponseFormat(c, code.Success, tmpAllDate)
}
type InitForMonitorArg struct {
TreeNodes []string `json:"treeNodes"`
- Tasks []string `json:"tasks"`
+ Tasks []string `json:"tasks"`
}
// @Security ApiKeyAuth
@@ -114,9 +114,9 @@
}
//璇锋眰澶�
localConf, err2 := cache.GetServerInfo()
- if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ if err2 != nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
logger.Debug("localConfig is wrong!!!")
- util.ResponseFormat(c,code.ComError,"localConf wrong")
+ util.ResponseFormat(c, code.ComError, "localConf wrong")
return
}
url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
@@ -136,12 +136,13 @@
linkTagInfoCameraIdStr +
linkTagInfoAnalyServerFilterStr +
"]}}" +
- "]}}," +
+ "],\"minimum_should_match\":1}}," +
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"20\"," +
"\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"
//logger.Debug("url:", url)
//logger.Debug("InitForMonitoringData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
- util.ResponseFormat(c, code.Success, tokenRes)
+ tmpAllDate := esutil.ResponseData(tokenRes)
+ util.ResponseFormat(c, code.Success, tmpAllDate)
}
--
Gitblit v1.8.0