From 58cdde93bbe0c913c0c45a63bb9d7307fac65962 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期二, 25 六月 2019 19:57:05 +0800
Subject: [PATCH] add tablename by id
---
esutil/EsApi.go | 13 ++++++-------
esutil/EsClient.go | 4 ++++
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/esutil/EsApi.go b/esutil/EsApi.go
index d5510da..835ff21 100644
--- a/esutil/EsApi.go
+++ b/esutil/EsApi.go
@@ -53,15 +53,14 @@
}
// 鏍规嵁tableid 鏌ヨtablename
-
-func Dbtablename(tableid string ) (tablename string) {
+func Dbtablename(tableid string ) (tablename string, err error) {
var dbinfotable =` {
"query": {
"bool": {
"filter": [
{
"term": {
- "id":`+tableid+`
+ "id":"`+tableid+`"
}
}
]
@@ -74,18 +73,18 @@
`
buf, err := EsReq("POST", "http://192.168.1.182:9200/dbtables/_search",[]byte(dbinfotable))
if err != nil {
- return nil ,errors.New("http request dbtablename info is err!")
+ return "" ,errors.New("http request dbtablename info is err!")
}
sources, err := Sourcelist(buf)
if err != nil {
- return nil,err
+ return "",err
}
for _, source := range sources {
- if name, ok := souce["tableName"].(string); ok {
+ if name, ok := source["tableName"].(string); ok {
tablename = name
break
}
}
- return
+ return tablename, nil
}
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 32eae09..4381757 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -39,6 +39,10 @@
tmpinfo.Idcard,ok = source["idCard"].(string)
Isnil("idCard", ok)
tmpinfo.MonitorLevel,ok = source["monitorLevel"].(string)
+
+ // 鏍规嵁 tableid 鑾峰彇 tablename
+ name, _:= Dbtablename(tmpinfo.TableId)
+ tmpinfo.TableName= name
baseinfos = append(baseinfos, &tmpinfo)
}
return baseinfos
--
Gitblit v1.8.0