From f4acb3a3ef03f09813acf80445e4fb746d552887 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 30 七月 2019 11:32:03 +0800
Subject: [PATCH] fix taglist
---
controllers/taglist.go | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/controllers/taglist.go b/controllers/taglist.go
index 774f21d..972191f 100644
--- a/controllers/taglist.go
+++ b/controllers/taglist.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "encoding/json"
"fmt"
"github.com/gin-gonic/gin"
@@ -32,12 +33,13 @@
fmt.Println(tokenRes["datalist"].([]interface{}))
for _, value := range tokenRes["datalist"].([]interface{}) {
tokenRes := make(map[string]interface{})
- tokenRes["key"] = value.(map[string]interface{})["id"].(string)
+ key := value.(map[string]interface{})["id"].(string)
+ tokenRes["key"] = key
tokenRes["title"] = value.(map[string]interface{})["tableName"].(string)
tokenRes["value"] = value.(map[string]interface{})["id"].(string)
- tokenRes["status"] = int(value.(map[string]interface{})["isDelete"])
+ tokenRes["status"] = value.(map[string]interface{})["isDelete"]
if tokenRes["status"] == 1 {
- if GetTotalFromDb(tokenRes["key"]) == false{
+ if GetTotalFromDb(key) == false{
continue
}
@@ -52,7 +54,7 @@
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/_search"
prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"baseInfo.tableId\":\""+id+"\"}}]}},\"size\":0}"
- buf, err := EsReq("POST", url, []byte(prama))
+ buf, err := esutil.EsReq("POST", url, []byte(prama))
if err != nil {
fmt.Println("http request info is err!")
return
@@ -69,9 +71,9 @@
fmt.Println("first hits change error!")
return
}
- total = int(middle["total"].(float64))
+ total := int(middle["total"].(float64))
fmt.Println(total)
- if total>0 {
+ if total > 0 {
flag=true
}
return flag
--
Gitblit v1.8.0