From c297639fa9265ff1b21e05b3e4a852eea625ced2 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 08 七月 2019 11:42:07 +0800
Subject: [PATCH] rm compare scord
---
es.proto | 3 -
es.pb.go | 95 ++++++++++++++++-------------------------------
2 files changed, 34 insertions(+), 64 deletions(-)
diff --git a/es.pb.go b/es.pb.go
index 8d26799..c4e7803 100644
--- a/es.pb.go
+++ b/es.pb.go
@@ -23,18 +23,17 @@
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"`
- CompareScore float32 `protobuf:"fixed32,5,opt,name=compareScore,proto3" json:"compareScore,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"`
+ 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"`
}
func (m *Baseinfo) Reset() { *m = Baseinfo{} }
@@ -96,13 +95,6 @@
return m.TableName
}
return ""
-}
-
-func (m *Baseinfo) GetCompareScore() float32 {
- if m != nil {
- return m.CompareScore
- }
- return 0
}
func (m *Baseinfo) GetPersonName() string {
@@ -275,29 +267,28 @@
func init() { proto.RegisterFile("es.proto", fileDescriptor_718db5c20d0f3738) }
var fileDescriptor_718db5c20d0f3738 = []byte{
- // 342 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xcf, 0x6a, 0xc2, 0x40,
- 0x10, 0xc6, 0x4d, 0xa2, 0x31, 0x8e, 0x52, 0xca, 0x1e, 0xca, 0x50, 0x4a, 0x08, 0x39, 0xe5, 0xe4,
- 0xc1, 0xbe, 0x81, 0xd0, 0x82, 0x50, 0xa4, 0x58, 0xfa, 0x00, 0x31, 0x19, 0xdb, 0x05, 0x93, 0x95,
- 0xdd, 0x58, 0x7c, 0x8c, 0x3e, 0x56, 0x8f, 0x1e, 0x7b, 0x2c, 0x7a, 0xed, 0x43, 0x94, 0x4c, 0x92,
- 0xfa, 0xef, 0xb4, 0xf3, 0xfd, 0x66, 0x99, 0x19, 0xbe, 0x0f, 0x3c, 0x32, 0xc3, 0x95, 0x56, 0x85,
- 0x12, 0x1e, 0x3f, 0x99, 0x79, 0x0b, 0x7f, 0x6d, 0xf0, 0xc6, 0xb1, 0x21, 0x99, 0x2f, 0x94, 0x08,
- 0xa0, 0xbf, 0x88, 0x13, 0x7a, 0xa4, 0xb8, 0x58, 0x6b, 0x42, 0x2b, 0xb0, 0xa2, 0xde, 0xec, 0x18,
- 0x89, 0x5b, 0xf0, 0x56, 0xa4, 0x8d, 0xca, 0x27, 0x29, 0xda, 0xdc, 0xfe, 0xd7, 0x02, 0xa1, 0x5b,
- 0xc4, 0xf3, 0x25, 0x4d, 0x52, 0x74, 0xb8, 0xd5, 0x48, 0x71, 0x07, 0x3d, 0x2e, 0xa7, 0x71, 0x46,
- 0xd8, 0xe6, 0xde, 0x01, 0x88, 0x10, 0x06, 0x89, 0xca, 0x56, 0xb1, 0xa6, 0x97, 0x44, 0x69, 0xc2,
- 0x4e, 0x60, 0x45, 0xf6, 0xec, 0x84, 0x09, 0x1f, 0xa0, 0xda, 0xc3, 0x23, 0x5c, 0x1e, 0x71, 0x44,
- 0xca, 0x19, 0x95, 0x7a, 0x96, 0xc9, 0xab, 0x5e, 0x62, 0x97, 0x7f, 0x9c, 0x30, 0xbe, 0xfd, 0x5d,
- 0xe5, 0x34, 0x5d, 0x67, 0xe8, 0xd5, 0xb7, 0xd7, 0x5a, 0x5c, 0x83, 0x63, 0x68, 0x83, 0x3d, 0xc6,
- 0x65, 0x29, 0x6e, 0xc0, 0x95, 0x69, 0x12, 0xeb, 0x14, 0x81, 0x61, 0xad, 0xca, 0x4d, 0x99, 0xca,
- 0x65, 0xa1, 0xf4, 0x13, 0x7d, 0xd0, 0x12, 0xfb, 0xd5, 0xa6, 0x63, 0x56, 0x3a, 0x91, 0xa8, 0xbc,
- 0xa0, 0xbc, 0xc0, 0x41, 0xe5, 0x44, 0x2d, 0xc3, 0x11, 0xb8, 0xe3, 0xd2, 0x6a, 0x23, 0x22, 0xe8,
- 0x70, 0x81, 0x56, 0xe0, 0x44, 0xfd, 0x91, 0x18, 0x36, 0x91, 0x0c, 0x9b, 0x38, 0x66, 0xd5, 0x87,
- 0x70, 0x03, 0xee, 0x83, 0xe1, 0x7c, 0xae, 0xc0, 0x96, 0x69, 0x1d, 0x8b, 0x2d, 0x0f, 0x8e, 0xcb,
- 0x26, 0x8c, 0x46, 0x9e, 0x27, 0xe9, 0x5c, 0x26, 0x79, 0xee, 0x7a, 0xfb, 0xd2, 0xf5, 0x31, 0x7e,
- 0xed, 0x7c, 0x6b, 0xbb, 0xf3, 0xad, 0x9f, 0x9d, 0x6f, 0x7d, 0xee, 0xfd, 0xd6, 0x76, 0xef, 0xb7,
- 0xbe, 0xf7, 0x7e, 0x6b, 0xee, 0xf2, 0xb5, 0xf7, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xd8,
- 0xed, 0xc7, 0x53, 0x02, 0x00, 0x00,
+ // 332 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xc1, 0x6a, 0xc2, 0x40,
+ 0x10, 0x86, 0x4d, 0xd2, 0xc6, 0x38, 0x4a, 0x29, 0x7b, 0x28, 0x43, 0x29, 0x8b, 0xe4, 0xe4, 0xc9,
+ 0x83, 0x7d, 0x03, 0xa1, 0x05, 0xa1, 0x48, 0xb1, 0xf4, 0x01, 0xd6, 0x64, 0x6c, 0x17, 0x4c, 0x56,
+ 0x76, 0x63, 0xf1, 0x31, 0xfa, 0x58, 0x1e, 0x3d, 0xf6, 0x58, 0xf4, 0x45, 0x4a, 0x26, 0x49, 0xd5,
+ 0xf6, 0x94, 0xf9, 0xff, 0x7f, 0xc9, 0xcc, 0x7c, 0x03, 0x11, 0xb9, 0xe1, 0xca, 0x9a, 0xc2, 0x88,
+ 0x88, 0x3f, 0x99, 0x7b, 0x8b, 0xb7, 0x3e, 0x44, 0x63, 0xe5, 0x48, 0xe7, 0x0b, 0x23, 0xfa, 0xd0,
+ 0x5d, 0xa8, 0x84, 0x1e, 0x49, 0x15, 0x6b, 0x4b, 0xe8, 0xf5, 0xbd, 0x41, 0x67, 0x76, 0x6a, 0x89,
+ 0x5b, 0x88, 0x56, 0x64, 0x9d, 0xc9, 0x27, 0x29, 0xfa, 0x1c, 0xff, 0x6a, 0x81, 0xd0, 0x2e, 0xd4,
+ 0x7c, 0x49, 0x93, 0x14, 0x03, 0x8e, 0x1a, 0x29, 0xee, 0xa0, 0xc3, 0xe5, 0x54, 0x65, 0x84, 0x17,
+ 0x9c, 0x1d, 0x0d, 0x21, 0x01, 0xaa, 0x7f, 0x70, 0x1c, 0x72, 0x7c, 0xe2, 0x88, 0x18, 0x7a, 0x95,
+ 0x7a, 0xd6, 0xc9, 0xab, 0x5d, 0x62, 0x9b, 0x5f, 0x9c, 0x79, 0x3c, 0xd7, 0xbb, 0xc9, 0x69, 0xba,
+ 0xce, 0x30, 0xaa, 0xe7, 0xaa, 0xb5, 0xb8, 0x86, 0xc0, 0xd1, 0x06, 0x3b, 0x6c, 0x97, 0xa5, 0xb8,
+ 0x81, 0x50, 0xa7, 0x89, 0xb2, 0x29, 0x02, 0x9b, 0xb5, 0x2a, 0x3b, 0x65, 0x26, 0xd7, 0x85, 0xb1,
+ 0x4f, 0xf4, 0x41, 0x4b, 0xec, 0x56, 0x9d, 0x4e, 0xbd, 0x72, 0xcb, 0xc4, 0xe4, 0x05, 0xe5, 0x05,
+ 0xf6, 0xaa, 0x2d, 0x6b, 0x19, 0x8f, 0x20, 0x1c, 0x97, 0x18, 0x9d, 0x18, 0xc0, 0x25, 0x17, 0xe8,
+ 0xf5, 0x83, 0x41, 0x77, 0x24, 0x86, 0x0d, 0xee, 0x61, 0x83, 0x7a, 0x56, 0x3d, 0x88, 0x37, 0x10,
+ 0x3e, 0x38, 0x66, 0x7f, 0x05, 0xbe, 0x4e, 0x6b, 0xe4, 0xbe, 0x3e, 0xd2, 0xd4, 0x0d, 0xe8, 0x46,
+ 0xfe, 0xbd, 0x52, 0xf0, 0xff, 0x4a, 0x31, 0xf4, 0x12, 0x93, 0xad, 0x94, 0xa5, 0x97, 0xc4, 0xd8,
+ 0x0a, 0xb9, 0x3f, 0x3b, 0xf3, 0xc6, 0xb8, 0xdd, 0x4b, 0x6f, 0xb7, 0x97, 0xde, 0xf7, 0x5e, 0x7a,
+ 0x9f, 0x07, 0xd9, 0xda, 0x1d, 0x64, 0xeb, 0xeb, 0x20, 0x5b, 0xf3, 0x90, 0xa7, 0xbd, 0xff, 0x09,
+ 0x00, 0x00, 0xff, 0xff, 0x5b, 0x12, 0xc2, 0xf5, 0x2f, 0x02, 0x00, 0x00,
}
func (m *Baseinfo) Marshal() (dAtA []byte, err error) {
@@ -338,12 +329,6 @@
i++
i = encodeVarintEs(dAtA, i, uint64(len(m.TableName)))
i += copy(dAtA[i:], m.TableName)
- }
- if m.CompareScore != 0 {
- dAtA[i] = 0x2d
- i++
- encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.CompareScore))))
- i += 4
}
if len(m.PersonName) > 0 {
dAtA[i] = 0x32
@@ -492,9 +477,6 @@
l = len(m.TableName)
if l > 0 {
n += 1 + l + sovEs(uint64(l))
- }
- if m.CompareScore != 0 {
- n += 5
}
l = len(m.PersonName)
if l > 0 {
@@ -736,17 +718,6 @@
}
m.TableName = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 5:
- 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))
case 6:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PersonName", wireType)
diff --git a/es.proto b/es.proto
index 0022842..ef13b81 100644
--- a/es.proto
+++ b/es.proto
@@ -7,13 +7,12 @@
string personId = 2;
string tableId = 3;
string tableName =4;
- float compareScore= 5;
string personName =6;
string personPicUrl =7;
string phoneNum =8;
string sex =9;
string idcard = 10;
- string monitorLevel = 11;
+ string monitorLevel = 11;
string content = 12;
}
--
Gitblit v1.8.0