From 712ef81c6b8813a498a66cf61ffcd37e5c502c8c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 01 十一月 2019 13:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/taglist.go | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/controllers/taglist.go b/controllers/taglist.go
index d897d74..2f3c5d9 100644
--- a/controllers/taglist.go
+++ b/controllers/taglist.go
@@ -2,8 +2,11 @@
import (
"basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
"encoding/json"
"fmt"
+ "strconv"
+ "webserver/cache"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
@@ -12,6 +15,7 @@
"github.com/gin-gonic/gin"
)
+// @Security ApiKeyAuth
// @Summary 鏍囩鍒楄〃
// @Description 杩斿洖搴曞簱鏍囩
// @Accept json
@@ -19,11 +23,11 @@
// @Tags es
// @Success 200 {string} json "{"code":200, msg:"", success:true}"
// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
-// @Router /data/api-v/es/taskList [POST]
+// @Router /data/api-v/es/tagList [POST]
func (sc *EsSearchController) PostEsTagList(c *gin.Context) {
var dtApi dbapi.DbTableApi
- dts, err := dtApi.FindAllDbTablesByCurServer()
+ dts, err := dtApi.FindAllDbTablesByCurServer("-1")
if err == nil {
if dts !=nil {
sources := make([]map[string]interface{}, 0)
@@ -33,6 +37,8 @@
tokenRes["title"] = dt.TableName
tokenRes["value"] = dt.Id
tokenRes["status"] = dt.IsDelete
+ tokenRes["bwType"] = dt.BwType //0锛氱櫧鍚嶅崟锛�1锛氶粦鍚嶅崟
+ tokenRes["analyServerId"] = dt.AnalyServerId //涓虹┖鏄悓姝ュ簱锛屼笉涓虹┖鏄湰鍦板簱
if dt.IsDelete == 1 {
if GetTotalFromDb(dt.Id) == false {
continue
@@ -50,7 +56,12 @@
//鍒ゆ柇搴曞簱鏄惁鏈夋暟鎹�
func GetTotalFromDb(id string) (flag bool) {
flag = false
- 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 false
+ }
+ url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + config.EsInfo.EsIndex.VideoPersons.IndexName + "/_search"
prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"baseInfo.tableId\":\"" + id + "\"}}]}},\"size\":0}"
buf, err := esutil.EsReq("POST", url, []byte(prama))
--
Gitblit v1.8.0