From f26a0cab5bca17b7eab57f6330e576271e17a17f Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:12:08 +0800
Subject: [PATCH] update ynSwagger,sync to master
---
controllers/initForData.go | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/controllers/initForData.go b/controllers/initForData.go
index fc0c9d4..1bd75ab 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -1,10 +1,12 @@
package controllers
import (
- "basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
"fmt"
"github.com/gin-gonic/gin"
+ "strconv"
"strings"
+ "webserver/cache"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
@@ -14,32 +16,40 @@
type InitForData struct {
}
+// @Security ApiKeyAuth
// @Summary 鎶撴媿瀹炴椂鍥炬暟鎹垵濮嬪寲
// @Description 瀹炴椂鑾峰彇鏁版嵁
// @Accept json
// @Produce json
// @Tags realTime
+// @Param obj body controllers.RealTimeArg false "鎶撴媿瀹炴椂鍥惧垵濮嬪寲鍙傛暟"
// @Success 200 {string} json "{"code":200, msg:"", success:true}"
// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
// @Router /data/api-v/realTime/initForCaptureData [POST]
+//瀹炴椂鎶撴媿鏁版嵁鍒濆鍖�
func (rc *RealTimeController) InitForCaptureData(c *gin.Context) {
- searchBody := make(map[string]interface{}, 0)
+ //searchBody := make(map[string]interface{}, 0)
+ var searchBody RealTimeArg
c.BindJSON(&searchBody)
index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
- 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"
cameraIdStr := ""
- if searchBody["treeNodes"] !=nil {
- cameraId := searchBody["treeNodes"].([]interface{})
+ 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 + "\"]}},"
}
}
- var setApi dbapi.SysSetApi
- _, sysconf := setApi.GetServerInfo()
- analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"
+ analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}}"
prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isAlarm\":\"1\"}}," +
cameraIdStr +
@@ -57,6 +67,7 @@
Tasks []string `json:"tasks"`
}
+// @Security ApiKeyAuth
// @Summary 瀹炴椂浠诲姟鐩戞帶鏁版嵁鍒濆鍖�
// @Description 瀹炴椂鐩戞帶姣斿鏁版嵁
// @Accept json
@@ -85,11 +96,16 @@
taskIdStr = "{\"terms\":{\"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 + "\"}}"
prama := "{\"query\":{\"bool\":{\"filter\":[" +
cameraIdStr +
--
Gitblit v1.8.0