From 02e81455712ca60a18702e6203763e2d0cf3ee44 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 08 七月 2019 17:32:42 +0800
Subject: [PATCH] add compareScore
---
es.proto | 1
es.pb.go | 98 +++++++++++++++++++++++++++++++-----------------
2 files changed, 64 insertions(+), 35 deletions(-)
diff --git a/es.pb.go b/es.pb.go
index e5f39d1..423327a 100644
--- a/es.pb.go
+++ b/es.pb.go
@@ -23,18 +23,19 @@
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type Baseinfo struct {
- FaceFeature string `protobuf:"bytes,1,opt,name=faceFeature,proto3" json:"faceFeature,omitempty"`
- PersonId string `protobuf:"bytes,2,opt,name=personId,proto3" json:"personId,omitempty"`
- TableId string `protobuf:"bytes,3,opt,name=tableId,proto3" json:"tableId,omitempty"`
- TableName string `protobuf:"bytes,4,opt,name=tableName,proto3" json:"tableName,omitempty"`
- PersonName string `protobuf:"bytes,6,opt,name=personName,proto3" json:"personName,omitempty"`
- PersonPicUrl string `protobuf:"bytes,7,opt,name=personPicUrl,proto3" json:"personPicUrl,omitempty"`
- PhoneNum string `protobuf:"bytes,8,opt,name=phoneNum,proto3" json:"phoneNum,omitempty"`
- Sex string `protobuf:"bytes,9,opt,name=sex,proto3" json:"sex,omitempty"`
- Idcard string `protobuf:"bytes,10,opt,name=idcard,proto3" json:"idcard,omitempty"`
- MonitorLevel string `protobuf:"bytes,11,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"`
- Content string `protobuf:"bytes,12,opt,name=content,proto3" json:"content,omitempty"`
- PicDesc string `protobuf:"bytes,13,opt,name=picDesc,proto3" json:"picDesc,omitempty"`
+ FaceFeature string `protobuf:"bytes,1,opt,name=faceFeature,proto3" json:"faceFeature,omitempty"`
+ PersonId string `protobuf:"bytes,2,opt,name=personId,proto3" json:"personId,omitempty"`
+ TableId string `protobuf:"bytes,3,opt,name=tableId,proto3" json:"tableId,omitempty"`
+ TableName string `protobuf:"bytes,4,opt,name=tableName,proto3" json:"tableName,omitempty"`
+ PersonName string `protobuf:"bytes,6,opt,name=personName,proto3" json:"personName,omitempty"`
+ PersonPicUrl string `protobuf:"bytes,7,opt,name=personPicUrl,proto3" json:"personPicUrl,omitempty"`
+ PhoneNum string `protobuf:"bytes,8,opt,name=phoneNum,proto3" json:"phoneNum,omitempty"`
+ Sex string `protobuf:"bytes,9,opt,name=sex,proto3" json:"sex,omitempty"`
+ Idcard string `protobuf:"bytes,10,opt,name=idcard,proto3" json:"idcard,omitempty"`
+ MonitorLevel string `protobuf:"bytes,11,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"`
+ Content string `protobuf:"bytes,12,opt,name=content,proto3" json:"content,omitempty"`
+ PicDesc string `protobuf:"bytes,13,opt,name=picDesc,proto3" json:"picDesc,omitempty"`
+ CompareScore float32 `protobuf:"fixed32,14,opt,name=compareScore,proto3" json:"compareScore,omitempty"`
}
func (m *Baseinfo) Reset() { *m = Baseinfo{} }
@@ -152,6 +153,13 @@
return m.PicDesc
}
return ""
+}
+
+func (m *Baseinfo) GetCompareScore() float32 {
+ if m != nil {
+ return m.CompareScore
+ }
+ return 0
}
type Binfos struct {
@@ -275,29 +283,29 @@
func init() { proto.RegisterFile("es.proto", fileDescriptor_718db5c20d0f3738) }
var fileDescriptor_718db5c20d0f3738 = []byte{
- // 344 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xcf, 0x4a, 0xf3, 0x40,
- 0x14, 0xc5, 0x9b, 0xe4, 0xfb, 0xd2, 0xf4, 0xb6, 0x8a, 0xcc, 0x42, 0x2e, 0x22, 0xa1, 0x64, 0xd5,
- 0x55, 0x17, 0xf5, 0x0d, 0x8a, 0x0a, 0x05, 0x29, 0x52, 0xf1, 0x01, 0xd2, 0xc9, 0xad, 0x0e, 0x34,
- 0x99, 0x30, 0x93, 0x4a, 0x1f, 0xc3, 0xc7, 0x72, 0xd9, 0xa5, 0x4b, 0x49, 0x5f, 0x44, 0x72, 0x93,
- 0xd8, 0x56, 0x57, 0xb9, 0xe7, 0x9c, 0x21, 0xf7, 0xcf, 0x0f, 0x02, 0xb2, 0xe3, 0xdc, 0xe8, 0x42,
- 0x8b, 0x80, 0x3f, 0xa9, 0x7d, 0x89, 0x4a, 0x17, 0x82, 0x69, 0x6c, 0x49, 0x65, 0x2b, 0x2d, 0x86,
- 0xd0, 0x5f, 0xc5, 0x92, 0xee, 0x29, 0x2e, 0x36, 0x86, 0xd0, 0x19, 0x3a, 0xa3, 0xde, 0xe2, 0xd8,
- 0x12, 0x57, 0x10, 0xe4, 0x64, 0xac, 0xce, 0x66, 0x09, 0xba, 0x1c, 0xff, 0x68, 0x81, 0xd0, 0x2d,
- 0xe2, 0xe5, 0x9a, 0x66, 0x09, 0x7a, 0x1c, 0xb5, 0x52, 0x5c, 0x43, 0x8f, 0xcb, 0x79, 0x9c, 0x12,
- 0xfe, 0xe3, 0xec, 0x60, 0x88, 0x10, 0xa0, 0xfe, 0x07, 0xc7, 0x3e, 0xc7, 0x47, 0x8e, 0x88, 0x60,
- 0x50, 0xab, 0x47, 0x25, 0x9f, 0xcd, 0x1a, 0xbb, 0xfc, 0xe2, 0xc4, 0xe3, 0xb9, 0x5e, 0x75, 0x46,
- 0xf3, 0x4d, 0x8a, 0x41, 0x33, 0x57, 0xa3, 0xc5, 0x05, 0x78, 0x96, 0xb6, 0xd8, 0x63, 0xbb, 0x2a,
- 0xc5, 0x25, 0xf8, 0x2a, 0x91, 0xb1, 0x49, 0x10, 0xd8, 0x6c, 0x54, 0xd5, 0x29, 0xd5, 0x99, 0x2a,
- 0xb4, 0x79, 0xa0, 0x37, 0x5a, 0x63, 0xbf, 0xee, 0x74, 0xec, 0x55, 0x5b, 0x4a, 0x9d, 0x15, 0x94,
- 0x15, 0x38, 0xa8, 0xb7, 0x6c, 0x64, 0x95, 0xe4, 0x4a, 0xde, 0x92, 0x95, 0x78, 0x56, 0x27, 0x8d,
- 0x8c, 0x26, 0xe0, 0x4f, 0xab, 0x03, 0x5b, 0x31, 0x82, 0xff, 0x5c, 0xa0, 0x33, 0xf4, 0x46, 0xfd,
- 0x89, 0x18, 0xb7, 0x20, 0xc6, 0x2d, 0x84, 0x45, 0xfd, 0x20, 0xda, 0x82, 0x7f, 0x67, 0x99, 0xca,
- 0x39, 0xb8, 0x2a, 0x69, 0x60, 0xb8, 0xea, 0x70, 0x67, 0xd5, 0x22, 0x68, 0xe5, 0x6f, 0x7e, 0xde,
- 0x5f, 0x7e, 0x11, 0x0c, 0xa4, 0x4e, 0xf3, 0xd8, 0xd0, 0x93, 0xd4, 0xa6, 0x86, 0xe1, 0x2e, 0x4e,
- 0xbc, 0x29, 0x7e, 0x94, 0xa1, 0xb3, 0x2b, 0x43, 0xe7, 0xab, 0x0c, 0x9d, 0xf7, 0x7d, 0xd8, 0xd9,
- 0xed, 0xc3, 0xce, 0xe7, 0x3e, 0xec, 0x2c, 0x7d, 0x9e, 0xf6, 0xe6, 0x3b, 0x00, 0x00, 0xff, 0xff,
- 0x72, 0x32, 0x6a, 0xc9, 0x49, 0x02, 0x00, 0x00,
+ // 352 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xcd, 0x4a, 0xc3, 0x40,
+ 0x14, 0x85, 0x9b, 0xa4, 0xa6, 0xe9, 0x6d, 0x2d, 0x32, 0x0b, 0xb9, 0x88, 0x84, 0x90, 0x55, 0x56,
+ 0x5d, 0xd4, 0x37, 0x28, 0x2a, 0x14, 0xa4, 0x48, 0xc5, 0x07, 0x48, 0x27, 0xb7, 0x3a, 0xd0, 0x64,
+ 0xc2, 0x4c, 0x2a, 0x7d, 0x02, 0xd7, 0x3e, 0x96, 0xcb, 0x2e, 0x5d, 0x4a, 0xfb, 0x22, 0x92, 0x49,
+ 0x62, 0xff, 0x56, 0x73, 0xcf, 0x39, 0xc3, 0xcc, 0xb9, 0x7c, 0xe0, 0x91, 0x1e, 0xe6, 0x4a, 0x16,
+ 0x92, 0x79, 0xe6, 0x48, 0xf5, 0x5b, 0xf8, 0xe9, 0x80, 0x37, 0x8e, 0x35, 0x89, 0x6c, 0x21, 0x59,
+ 0x00, 0xbd, 0x45, 0xcc, 0xe9, 0x91, 0xe2, 0x62, 0xa5, 0x08, 0xad, 0xc0, 0x8a, 0xba, 0xb3, 0x43,
+ 0x8b, 0xdd, 0x80, 0x97, 0x93, 0xd2, 0x32, 0x9b, 0x24, 0x68, 0x9b, 0xf8, 0x5f, 0x33, 0x84, 0x4e,
+ 0x11, 0xcf, 0x97, 0x34, 0x49, 0xd0, 0x31, 0x51, 0x23, 0xd9, 0x2d, 0x74, 0xcd, 0x38, 0x8d, 0x53,
+ 0xc2, 0xb6, 0xc9, 0xf6, 0x06, 0xf3, 0x01, 0xaa, 0x37, 0x4c, 0xec, 0x9a, 0xf8, 0xc0, 0x61, 0x21,
+ 0xf4, 0x2b, 0xf5, 0x2c, 0xf8, 0xab, 0x5a, 0x62, 0xc7, 0xdc, 0x38, 0xf2, 0x4c, 0xaf, 0x77, 0x99,
+ 0xd1, 0x74, 0x95, 0xa2, 0x57, 0xf7, 0xaa, 0x35, 0xbb, 0x02, 0x47, 0xd3, 0x1a, 0xbb, 0xc6, 0x2e,
+ 0x47, 0x76, 0x0d, 0xae, 0x48, 0x78, 0xac, 0x12, 0x04, 0x63, 0xd6, 0xaa, 0xfc, 0x29, 0x95, 0x99,
+ 0x28, 0xa4, 0x7a, 0xa2, 0x0f, 0x5a, 0x62, 0xaf, 0xfa, 0xe9, 0xd0, 0x2b, 0xb7, 0xe4, 0x32, 0x2b,
+ 0x28, 0x2b, 0xb0, 0x5f, 0x6d, 0x59, 0xcb, 0x32, 0xc9, 0x05, 0xbf, 0x27, 0xcd, 0xf1, 0xb2, 0x4a,
+ 0x6a, 0x59, 0xbe, 0xcb, 0x65, 0x9a, 0xc7, 0x8a, 0x5e, 0xb8, 0x54, 0x84, 0x83, 0xc0, 0x8a, 0xec,
+ 0xd9, 0x91, 0x17, 0x8e, 0xc0, 0x1d, 0x97, 0x10, 0x34, 0x8b, 0xe0, 0xc2, 0x0c, 0x68, 0x05, 0x4e,
+ 0xd4, 0x1b, 0xb1, 0x61, 0x03, 0x6b, 0xd8, 0x80, 0x9a, 0x55, 0x17, 0xc2, 0x35, 0xb8, 0x0f, 0xda,
+ 0x90, 0x1b, 0x80, 0x2d, 0x92, 0x1a, 0x98, 0x2d, 0xf6, 0x2c, 0x44, 0x83, 0xa9, 0x91, 0xa7, 0x8c,
+ 0x9d, 0x73, 0xc6, 0xa7, 0x6d, 0xdb, 0xe7, 0x6d, 0xc7, 0xf8, 0xbd, 0xf5, 0xad, 0xcd, 0xd6, 0xb7,
+ 0x7e, 0xb7, 0xbe, 0xf5, 0xb5, 0xf3, 0x5b, 0x9b, 0x9d, 0xdf, 0xfa, 0xd9, 0xf9, 0xad, 0xb9, 0x6b,
+ 0xda, 0xde, 0xfd, 0x05, 0x00, 0x00, 0xff, 0xff, 0x72, 0xc9, 0x56, 0x6a, 0x6d, 0x02, 0x00, 0x00,
}
func (m *Baseinfo) Marshal() (dAtA []byte, err error) {
@@ -386,6 +394,12 @@
i++
i = encodeVarintEs(dAtA, i, uint64(len(m.PicDesc)))
i += copy(dAtA[i:], m.PicDesc)
+ }
+ if m.CompareScore != 0 {
+ dAtA[i] = 0x75
+ i++
+ encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.CompareScore))))
+ i += 4
}
return i, nil
}
@@ -524,6 +538,9 @@
l = len(m.PicDesc)
if l > 0 {
n += 1 + l + sovEs(uint64(l))
+ }
+ if m.CompareScore != 0 {
+ n += 5
}
return n
}
@@ -993,6 +1010,17 @@
}
m.PicDesc = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
+ case 14:
+ if wireType != 5 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CompareScore", wireType)
+ }
+ var v uint32
+ if (iNdEx + 4) > l {
+ return io.ErrUnexpectedEOF
+ }
+ v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
+ iNdEx += 4
+ m.CompareScore = float32(math.Float32frombits(v))
default:
iNdEx = preIndex
skippy, err := skipEs(dAtA[iNdEx:])
diff --git a/es.proto b/es.proto
index 3018ea1..6f8c5e8 100644
--- a/es.proto
+++ b/es.proto
@@ -15,6 +15,7 @@
string monitorLevel = 11;
string content = 12;
string picDesc = 13;
+ float compareScore =14;
}
message Binfos{
--
Gitblit v1.8.0