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/monitoring.go |   62 +++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/controllers/monitoring.go b/controllers/monitoring.go
index 209f66f..d18673a 100644
--- a/controllers/monitoring.go
+++ b/controllers/monitoring.go
@@ -1,9 +1,11 @@
 package controllers
 
 import (
-	"basic.com/dbapi.git"
+	"basic.com/valib/logger.git"
 	"fmt"
+	"strconv"
 	"strings"
+	"webserver/cache"
 
 	"github.com/gin-gonic/gin"
 	"webserver/extend/code"
@@ -12,52 +14,71 @@
 	"webserver/extend/util"
 )
 
+// @Security ApiKeyAuth
 // @Summary 瀹炴椂鐩戞帶
 // @Description 瀹炴椂鐩戞帶姣斿鏁版嵁
 // @Accept  json
 // @Produce json
 // @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}"
+// @Param obj body controllers.InitForMonitorArg true "瀹炴椂鐩戞帶鍙傛暟"
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
 // @Router /data/api-v/realTime/monitoring [POST]
-//瀹炴椂鐩戞帶
 func (rc *RealTimeController) PostMonitoring(c *gin.Context) {
-	searchBody := make(map[string]interface{}, 0)
+	//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 := ""
-	cameraId := searchBody["treeNodes"].([]interface{})
+	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\":[]}},"
-	taskId := searchBody["tasks"].([]interface{})
+	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 + "\"]}},"
 	}
 	//璇锋眰澶�
-	url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
+	localConf, err2 := cache.GetServerInfo()
+	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 + "\"}},"
+	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
+	linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}},"
 
-	prama := "{\"query\":{\"bool\":{\"filter\":[" +
+	prama := "{\"query\":{\"bool\":{\"should\":[" +
+		"{\"bool\":{\"filter\":[" +
 		cameraIdStr +
 		taskIdStr +
 		analyServerFilterStr +
-		"{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}]}}," +
+		"{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
+		"]}}," +
+		"{\"bool\":{\"filter\":[" +
+		linkTagInfoCameraIdStr +
+		linkTagInfoTaskIdStr +
+		linkTagInfoAnalyServerFilterStr +
+		"{\"range\":{\"linkTagInfo.picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
+		"]}}" +
+		"],\"minimum_should_match\":1}}," +
 		"\"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)
-	fmt.Println(url)
+		"\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"
+	logger.Debug("monitor param:", prama)
+	logger.Debug("monitor url:", url)
 	tokenRes := esutil.GetEsDataReq(url, prama, true)
 	/*	for _, value := range tokenRes["datalist"].([]interface{}) {
 		if value.(map[string]interface{})["personId"] != nil {
@@ -67,5 +88,6 @@
 			}
 		}
 	}*/
-	util.ResponseFormat(c, code.Success, tokenRes)
+	tmpAllDate := esutil.ResponseData(tokenRes)
+	util.ResponseFormat(c, code.Success, tmpAllDate)
 }

--
Gitblit v1.8.0