From f9ecff08394b734fb8420044bcba471df1af352c Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期二, 25 六月 2019 14:24:07 +0800
Subject: [PATCH] add protobuf struct for baseinfo
---
shardmap/shardmap.go | 14 +++++++++-----
/dev/null | 19 -------------------
esutil/EsApi.go | 9 ++++++++-
esutil/EsClient.go | 8 +++++---
4 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/esutil/EsApi.go b/esutil/EsApi.go
index 04f397b..046647c 100644
--- a/esutil/EsApi.go
+++ b/esutil/EsApi.go
@@ -3,9 +3,11 @@
import (
"errors"
"strconv"
+
+ "basic.com/pubsub/protomsg.git"
)
-func DbPersoninfos( queryindex int, querynums int ) (dbpersoninfos []Baseinfo, err error){
+func DbPersoninfos( queryindex int, querynums int ) (dbpersoninfos []protomsg.Baseinfo, err error){
point := strconv.Itoa(queryindex)
number := strconv.Itoa(querynums)
@@ -32,14 +34,19 @@
]
}`
+ // 杩斿洖璇锋眰鐨刡uf
buf, err := GetDbinfo(dbinfoRequest )
if err != nil {
return nil ,errors.New("http request get dbperson info is err!")
}
+
+ // 杩斿洖 _source 鏁扮粍
sources, err := Sourcelist(buf)
if err != nil {
return nil,err
}
+
+ // 杩斿洖鎵�鏈夋煡璇㈢殑鏁版嵁
dbpersoninfos = Parsesources(sources)
return dbpersoninfos, nil
}
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index d022703..fa2de87 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -8,6 +8,8 @@
"net/http"
"time"
"bytes"
+
+ "basic.com/pubsub/protomsg.git"
)
@@ -17,9 +19,9 @@
}
-func Parsesources(sources []map[string]interface{}) []Baseinfo {
- var tmpinfo Baseinfo
- var baseinfos []Baseinfo
+func Parsesources(sources []map[string]interface{}) []protomsg.Baseinfo {
+ var tmpinfo protomsg.Baseinfo
+ var baseinfos []protomsg.Baseinfo
var ok bool
for _, source := range sources {
diff --git a/esutil/EsStruct.go b/esutil/EsStruct.go
deleted file mode 100644
index 7a71a28..0000000
--- a/esutil/EsStruct.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package esutil
-
-
- type Baseinfo struct {
- FaceFeature string `json:"faceFeature"`
- PersonId string `json:"id"`
- TableId string `json:"tableId"`
- TableName string `json:"-"`
- compareScore float32 `json:"-"`
- PersonName string `json:"personName"`
- PersonPicUrl string `json:"personPicUrl"`
- PhoneNum string `json:"phoneNum"`
- Sex string `json:"sex"`
- Idcard string `json:"idCard"`
- MonitorLevel string `json:"monitorLevel"`
- Content string `json:"-"`
-}
-
-
diff --git a/shardmap/shardmap.go b/shardmap/shardmap.go
index 8feb527..f634e19 100644
--- a/shardmap/shardmap.go
+++ b/shardmap/shardmap.go
@@ -5,6 +5,8 @@
import (
"sync"
"fmt"
+
+ "basic.com/pubsub/protomsg.git"
)
const (
@@ -81,11 +83,11 @@
}
// modify by long.
-func (s *ShardMap) Walk(wf wfOp, cfrom string) []interface{} {
+func (s *ShardMap) Walk(wf wfOp, cfrom string) []protomsg.Baseinfo{
var wg sync.WaitGroup
var second float32
- var baseinfos []interface{}
+ var baseinfos []protomsg.Baseinfo
for _, si := range s.shards {
wg.Add(1)
@@ -97,12 +99,14 @@
if second == -1 {
continue
}
- fmt.Println("姣斿鍒嗘暟: ", second)
- baseinfos = append(baseinfos, value )
+ if info, ok := value.(protomsg.Baseinfo) ;ok {
+ fmt.Println("姣斿鍒嗘暟: ", second)
+ info.CompareScore = second
+ baseinfos = append(baseinfos,info)
+ }
}
s.RUnlock()
}(si,wf, cfrom)
-
}
wg.Wait()
return baseinfos
--
Gitblit v1.8.0