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/taglist.go | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/controllers/taglist.go b/controllers/taglist.go
index 107532e..689dae7 100644
--- a/controllers/taglist.go
+++ b/controllers/taglist.go
@@ -2,12 +2,20 @@
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"
"webserver/extend/util"
"github.com/gin-gonic/gin"
)
+// @Security ApiKeyAuth
// @Summary 鏍囩鍒楄〃
// @Description 杩斿洖搴曞簱鏍囩
// @Accept json
@@ -15,12 +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
- var dbpApi dbapi.DbPersonApi
- dts, err := dtApi.FindAllDbTablesByCurServer()
+ dts, err := dtApi.FindAllDbTablesByCurServer("-1")
if err == nil {
if dts !=nil {
sources := make([]map[string]interface{}, 0)
@@ -30,9 +37,10 @@
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 {
- personTotal,_ := dbpApi.GetPersonTotal(dt.Id)
- if personTotal == 0 {
+ if GetTotalFromDb(dt.Id) == false {
continue
}
}
@@ -44,3 +52,39 @@
}
util.ResponseFormat(c,code.ComError,"鏌ヨ搴曞簱鏍囩澶辫触")
}
+
+//鍒ゆ柇搴曞簱鏄惁鏈夋暟鎹�
+func GetTotalFromDb(id string) (flag bool) {
+ flag = false
+ 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.AiOcean.IndexName + "/_search"
+ prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"baseInfo.tableId\":\"" + id + "\"}}]}},\"size\":0}"
+ buf, err := esutil.EsReq("POST", url, []byte(prama))
+ if err != nil {
+ fmt.Println("http request info is err!")
+ return
+ }
+ var info interface{}
+ json.Unmarshal(buf, &info)
+ out, ok := info.(map[string]interface{})
+ if !ok {
+ fmt.Println("http response interface can not change map[string]interface{}")
+ return
+ }
+ middle, ok := out["hits"].(map[string]interface{})
+ if !ok {
+ fmt.Println("first hits change error!")
+ return
+ }
+
+ total := int(middle["total"].(float64))
+ if total > 0 {
+ flag = true
+ }
+ return flag
+}
\ No newline at end of file
--
Gitblit v1.8.0