From 9403e8b0eaa628a062d338244cfeb6f88ffe372d Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 08 七月 2019 10:24:51 +0800
Subject: [PATCH] add if tableid== , range all
---
esutil/EsApi.go | 49 +++++++++++++++++++------------------------------
1 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/esutil/EsApi.go b/esutil/EsApi.go
index d5510da..3d92d2b 100644
--- a/esutil/EsApi.go
+++ b/esutil/EsApi.go
@@ -8,7 +8,8 @@
)
// 鏌ヨ搴曞簱浜哄憳淇℃伅
-func DbPersoninfos( queryindex int, querynums int ) (dbpersoninfos []*protomsg.Baseinfo, err error){
+func DbPersoninfos( queryindex int, querynums int ) ([]*protomsg.Esinfo, error){
+ var dbinfos []*protomsg.Esinfo
point := strconv.Itoa(queryindex)
number := strconv.Itoa(querynums)
@@ -17,51 +18,39 @@
"query": {
"match_all": {}
},
- "size":`+ number +`,
- "_source": [
+ "size":`+ number +`,
+ "_source": [
+ "id",
"tableId",
- "tableName",
- "compareScore",
- "personId",
- "personName",
- "personPicUrl",
- "phoneNum",
- "sex",
- "idCard",
- "monitorLevel",
- "faceFeature",
- "content",
- "id"
+ "faceFeature"
]
- }`
+ }`
- // 杩斿洖璇锋眰鐨刡uf
- buf, err := GetDbinfo(dbinfoRequest )
- if err != nil {
- return nil ,errors.New("http request get dbperson info is err!")
- }
+ buf, err := EsReq("POST", "http://192.168.1.182:9200/dbtablepersons/dbpersons/_search",[]byte(dbinfoRequest))
+ if err != nil {
+ return dbinfos ,errors.New("http request dbtablename info is err!")
+ }
// 杩斿洖 _source 鏁扮粍
sources, err := Sourcelist(buf)
if err != nil {
- return nil,err
+ return dbinfos,err
}
// 杩斿洖鎵�鏈夋煡璇㈢殑鏁版嵁
- dbpersoninfos = Parsesources(sources)
+ dbpersoninfos := Parsesources(sources)
return dbpersoninfos, nil
}
// 鏍规嵁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 +63,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
}
--
Gitblit v1.8.0