From 3e7fd5950d794150c2045b6fc2d764f72602c94e Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 19 十一月 2019 17:33:50 +0800
Subject: [PATCH] update BaseInfo
---
aiocean.proto | 16 +-
aiocean.pb.go | 378 +++++++++++++++++++----------------------------------
2 files changed, 145 insertions(+), 249 deletions(-)
diff --git a/aiocean.pb.go b/aiocean.pb.go
index a5af9b3..f41ed47 100644
--- a/aiocean.pb.go
+++ b/aiocean.pb.go
@@ -779,15 +779,13 @@
TableId string `protobuf:"bytes,1,opt,name=tableId,proto3" json:"tableId,omitempty"`
TableName string `protobuf:"bytes,2,opt,name=tableName,proto3" json:"tableName,omitempty"`
CompareScore float32 `protobuf:"fixed32,3,opt,name=compareScore,proto3" json:"compareScore,omitempty"`
- PersonId string `protobuf:"bytes,4,opt,name=personId,proto3" json:"personId,omitempty"`
- PersonName string `protobuf:"bytes,5,opt,name=personName,proto3" json:"personName,omitempty"`
- PersonPicUrl string `protobuf:"bytes,6,opt,name=personPicUrl,proto3" json:"personPicUrl,omitempty"`
- PhoneNum string `protobuf:"bytes,7,opt,name=phoneNum,proto3" json:"phoneNum,omitempty"`
- Sex string `protobuf:"bytes,8,opt,name=sex,proto3" json:"sex,omitempty"`
- IdCard string `protobuf:"bytes,9,opt,name=idCard,proto3" json:"idCard,omitempty"`
- MonitorLevel string `protobuf:"bytes,10,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"`
- Content string `protobuf:"bytes,11,opt,name=content,proto3" json:"content,omitempty"`
- BwType string `protobuf:"bytes,12,opt,name=bwType,proto3" json:"bwType,omitempty"`
+ BwType string `protobuf:"bytes,4,opt,name=bwType,proto3" json:"bwType,omitempty"`
+ TargetId string `protobuf:"bytes,5,opt,name=targetId,proto3" json:"targetId,omitempty"`
+ TargetName string `protobuf:"bytes,6,opt,name=targetName,proto3" json:"targetName,omitempty"`
+ TargetPicUrl string `protobuf:"bytes,7,opt,name=targetPicUrl,proto3" json:"targetPicUrl,omitempty"`
+ MonitorLevel string `protobuf:"bytes,8,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"`
+ Labels string `protobuf:"bytes,9,opt,name=labels,proto3" json:"labels,omitempty"`
+ Content string `protobuf:"bytes,10,opt,name=content,proto3" json:"content,omitempty"`
}
func (m *BaseInfo) Reset() { *m = BaseInfo{} }
@@ -844,44 +842,30 @@
return 0
}
-func (m *BaseInfo) GetPersonId() string {
+func (m *BaseInfo) GetBwType() string {
if m != nil {
- return m.PersonId
+ return m.BwType
}
return ""
}
-func (m *BaseInfo) GetPersonName() string {
+func (m *BaseInfo) GetTargetId() string {
if m != nil {
- return m.PersonName
+ return m.TargetId
}
return ""
}
-func (m *BaseInfo) GetPersonPicUrl() string {
+func (m *BaseInfo) GetTargetName() string {
if m != nil {
- return m.PersonPicUrl
+ return m.TargetName
}
return ""
}
-func (m *BaseInfo) GetPhoneNum() string {
+func (m *BaseInfo) GetTargetPicUrl() string {
if m != nil {
- return m.PhoneNum
- }
- return ""
-}
-
-func (m *BaseInfo) GetSex() string {
- if m != nil {
- return m.Sex
- }
- return ""
-}
-
-func (m *BaseInfo) GetIdCard() string {
- if m != nil {
- return m.IdCard
+ return m.TargetPicUrl
}
return ""
}
@@ -893,16 +877,16 @@
return ""
}
-func (m *BaseInfo) GetContent() string {
+func (m *BaseInfo) GetLabels() string {
if m != nil {
- return m.Content
+ return m.Labels
}
return ""
}
-func (m *BaseInfo) GetBwType() string {
+func (m *BaseInfo) GetContent() string {
if m != nil {
- return m.BwType
+ return m.Content
}
return ""
}
@@ -920,61 +904,59 @@
func init() { proto.RegisterFile("aiocean.proto", fileDescriptor_e7fb370e860fe148) }
var fileDescriptor_e7fb370e860fe148 = []byte{
- // 856 bytes of a gzipped FileDescriptorProto
+ // 829 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x55, 0xcd, 0x6e, 0x23, 0x45,
- 0x10, 0xce, 0x38, 0x8b, 0xed, 0xb4, 0x93, 0xec, 0xd2, 0x2c, 0xa1, 0x59, 0x90, 0x15, 0x59, 0x08,
- 0xe5, 0x80, 0x72, 0x58, 0x56, 0x9c, 0x71, 0x36, 0x1c, 0x2c, 0x99, 0x05, 0x4d, 0xc2, 0x03, 0xb4,
- 0x67, 0x2a, 0x4e, 0xcb, 0x33, 0xd3, 0xa3, 0xee, 0x76, 0xd6, 0x79, 0x00, 0xee, 0x3c, 0x0d, 0x07,
- 0x8e, 0x9c, 0x38, 0xe6, 0xc8, 0x11, 0x39, 0x2f, 0x82, 0xaa, 0xba, 0xe7, 0xcf, 0x70, 0xd8, 0x07,
- 0xc8, 0xc9, 0xfd, 0x7d, 0x55, 0xae, 0xae, 0xae, 0xaa, 0xaf, 0x86, 0x1d, 0x49, 0xa5, 0x13, 0x90,
- 0xc5, 0x79, 0x69, 0xb4, 0xd3, 0x7c, 0x48, 0x3f, 0xb9, 0x5d, 0x4e, 0x7e, 0xef, 0x33, 0xf6, 0x83,
- 0xbd, 0x94, 0x4e, 0x5e, 0x48, 0x0b, 0xfc, 0x98, 0xf5, 0x54, 0x2a, 0xa2, 0xd3, 0xe8, 0xec, 0x20,
- 0xee, 0xa9, 0x94, 0xbf, 0x62, 0xc3, 0x44, 0xe6, 0x60, 0xe4, 0x2c, 0x15, 0x3d, 0x62, 0x6b, 0xcc,
- 0xc7, 0x8c, 0xf9, 0xf3, 0x3b, 0x99, 0x83, 0xd8, 0x27, 0x6b, 0x8b, 0x69, 0xec, 0xd3, 0x34, 0x35,
- 0xe2, 0x59, 0xdb, 0x8e, 0x0c, 0xff, 0x8a, 0x1d, 0xc9, 0x42, 0x66, 0xf7, 0x57, 0x60, 0xee, 0xc0,
- 0xcc, 0x52, 0xf1, 0x11, 0xb9, 0x74, 0x49, 0x7e, 0xc6, 0x9e, 0xb7, 0x08, 0xba, 0xaa, 0x4f, 0x7e,
- 0xbb, 0xf4, 0x6e, 0xbc, 0x52, 0x0c, 0xfe, 0x1b, 0xaf, 0xe4, 0x5f, 0xb2, 0x83, 0x24, 0x5b, 0x5b,
- 0x47, 0x37, 0x0e, 0xc9, 0xa3, 0x21, 0xf8, 0x09, 0xeb, 0x3b, 0x69, 0x57, 0xb3, 0x54, 0x1c, 0x90,
- 0x29, 0x20, 0xac, 0x03, 0x9e, 0xe8, 0x7a, 0xe6, 0xeb, 0x50, 0x61, 0x2e, 0xd8, 0xc0, 0xa6, 0xde,
- 0x34, 0x22, 0x53, 0x05, 0xf1, 0xae, 0x52, 0x25, 0x3f, 0xca, 0xcd, 0x2f, 0x26, 0x13, 0x87, 0xfe,
- 0xae, 0x9a, 0xc0, 0x98, 0x77, 0x2a, 0x05, 0x8d, 0xc6, 0x23, 0x1f, 0xb3, 0xc2, 0x18, 0xb3, 0x54,
- 0xc9, 0xa5, 0x74, 0x20, 0x8e, 0x7d, 0xcc, 0x00, 0xf9, 0x1b, 0xc6, 0x9c, 0x34, 0x4b, 0x70, 0xb3,
- 0xe2, 0x46, 0x8b, 0xe7, 0xa7, 0xfb, 0x67, 0xa3, 0xd7, 0x2f, 0xcf, 0xab, 0x7e, 0x9e, 0x5f, 0xd7,
- 0xb6, 0xb8, 0xe5, 0xc7, 0x4f, 0xd9, 0x48, 0xbb, 0x5b, 0x30, 0x73, 0xb9, 0x80, 0xcc, 0x8a, 0x17,
- 0x14, 0xb3, 0x4d, 0x61, 0xb7, 0xec, 0xad, 0x7e, 0x1f, 0x1c, 0x3e, 0xf6, 0xdd, 0x6a, 0x18, 0xcc,
- 0x36, 0x53, 0x2b, 0xa0, 0x94, 0xb8, 0xcf, 0xb6, 0xc2, 0xfc, 0x9c, 0x0d, 0x17, 0xd2, 0x02, 0x65,
- 0xf4, 0x09, 0x65, 0xc4, 0x9b, 0x8c, 0x2e, 0x82, 0x25, 0xae, 0x7d, 0xf0, 0x75, 0xca, 0x4e, 0x33,
- 0x69, 0x72, 0xf1, 0xf2, 0x34, 0x3a, 0x1b, 0xc6, 0x15, 0xc4, 0x2c, 0x94, 0x9d, 0x26, 0x2b, 0x6f,
- 0xfc, 0x94, 0x8c, 0x2d, 0x06, 0x5f, 0x2f, 0xf1, 0x10, 0xaf, 0x33, 0xb0, 0xe2, 0x64, 0xf7, 0xf5,
- 0xd3, 0xda, 0x16, 0xb7, 0xfc, 0xb0, 0x0f, 0xca, 0xbe, 0xd5, 0x59, 0x06, 0x89, 0x13, 0x9f, 0x51,
- 0xd0, 0x86, 0xc0, 0x97, 0x29, 0x7b, 0x09, 0x19, 0x38, 0x10, 0x82, 0x8c, 0x35, 0xc6, 0x4c, 0x13,
- 0x5d, 0x38, 0x28, 0x9c, 0xf8, 0xdc, 0xf7, 0x21, 0xc0, 0xc9, 0xaf, 0x03, 0x36, 0x98, 0xce, 0x7e,
- 0x42, 0x51, 0x3d, 0xa9, 0xe6, 0x49, 0x35, 0x4f, 0xaa, 0xf9, 0x10, 0xd5, 0xa0, 0x25, 0x53, 0xc5,
- 0xea, 0x5a, 0x2e, 0xc5, 0x2b, 0x6f, 0x09, 0x90, 0x7f, 0xc7, 0x46, 0xe1, 0x48, 0x05, 0xf9, 0x62,
- 0x37, 0xc9, 0xe6, 0x23, 0x15, 0xb7, 0x1d, 0x27, 0x7f, 0x46, 0x8c, 0x35, 0xed, 0xf3, 0x23, 0x47,
- 0xa8, 0x12, 0x64, 0x8d, 0xb1, 0x9d, 0xfe, 0x7c, 0x95, 0x68, 0x03, 0xa4, 0xcc, 0x5e, 0xdc, 0xa6,
- 0x30, 0xbd, 0x1b, 0x90, 0x6e, 0x6d, 0x2a, 0x65, 0x56, 0x10, 0xe3, 0x96, 0x2a, 0xb9, 0xca, 0x71,
- 0xec, 0xbc, 0x28, 0x6b, 0xcc, 0xbf, 0x67, 0xc7, 0x3e, 0xc8, 0x5c, 0x27, 0xd2, 0x29, 0x5d, 0x90,
- 0x26, 0x47, 0xaf, 0xc5, 0xee, 0x80, 0x55, 0xf6, 0x78, 0xc7, 0x7f, 0xe2, 0xd8, 0x71, 0xd7, 0x83,
- 0x7f, 0xc3, 0x06, 0x4e, 0x97, 0x73, 0xb8, 0x71, 0xf4, 0x8c, 0xce, 0x6c, 0xd4, 0x61, 0x2a, 0x17,
- 0xfe, 0x86, 0x8d, 0x16, 0xda, 0x39, 0x9d, 0xc7, 0x6a, 0x79, 0xeb, 0xe8, 0x65, 0xff, 0xff, 0x8f,
- 0xb6, 0xdb, 0xe4, 0x6b, 0x36, 0xac, 0xef, 0x3b, 0x64, 0xd1, 0x86, 0x6e, 0xea, 0xc5, 0xd1, 0x06,
- 0xd1, 0x7d, 0xa8, 0x4f, 0x74, 0x3f, 0xf9, 0x23, 0x62, 0xac, 0x99, 0x11, 0x2c, 0xd2, 0xd2, 0xe8,
- 0x75, 0x59, 0x57, 0xb8, 0x82, 0x38, 0x87, 0x34, 0x3f, 0x73, 0xb8, 0x83, 0x2c, 0x6c, 0xbe, 0x16,
- 0x83, 0x45, 0x34, 0xeb, 0x0c, 0xae, 0x61, 0xe3, 0x42, 0x7d, 0x6b, 0xcc, 0x27, 0xec, 0x30, 0x85,
- 0x1b, 0x28, 0x12, 0xb8, 0x72, 0xa8, 0x96, 0x67, 0x34, 0x53, 0x1d, 0x0e, 0xf7, 0x8c, 0xb2, 0x73,
- 0x55, 0xac, 0xa8, 0xc0, 0xc3, 0x38, 0x20, 0xaf, 0xb2, 0x62, 0x45, 0x83, 0xd3, 0xaf, 0x54, 0xe6,
- 0xf1, 0x64, 0xdb, 0x63, 0xc3, 0x8b, 0x96, 0x84, 0x9c, 0x5c, 0x64, 0xd0, 0xa4, 0x1e, 0x20, 0x0e,
- 0x3b, 0x1d, 0x69, 0x21, 0xf9, 0xcc, 0x1b, 0x02, 0x93, 0x4b, 0x74, 0x5e, 0x4a, 0x03, 0x7e, 0x74,
- 0xf6, 0xa9, 0x34, 0x1d, 0x8e, 0x26, 0x04, 0x8c, 0xd5, 0xc5, 0x2c, 0xad, 0x27, 0x24, 0x60, 0x2c,
- 0x8c, 0x3f, 0x53, 0x78, 0xbf, 0xb1, 0x5b, 0x0c, 0xc6, 0xf7, 0xe8, 0x67, 0x95, 0xe0, 0x84, 0xf9,
- 0x47, 0x74, 0x38, 0x8a, 0x7f, 0xab, 0x0b, 0x78, 0xb7, 0xce, 0xc3, 0x8e, 0xae, 0x31, 0x7f, 0xc1,
- 0xf6, 0x2d, 0x6c, 0xc2, 0x62, 0xc6, 0x23, 0x95, 0x2a, 0x7d, 0x2b, 0x4d, 0xbd, 0x92, 0x3d, 0xc2,
- 0x9b, 0x72, 0x5d, 0x28, 0xa7, 0x8d, 0x6f, 0x92, 0x5f, 0xcb, 0x1d, 0xae, 0x2d, 0xdf, 0x51, 0x57,
- 0xbe, 0x27, 0xac, 0xbf, 0x78, 0x7f, 0x7d, 0x5f, 0x42, 0xd8, 0xcb, 0x01, 0x5d, 0x88, 0xbf, 0xb6,
- 0xe3, 0xe8, 0x61, 0x3b, 0x8e, 0xfe, 0xd9, 0x8e, 0xa3, 0xdf, 0x1e, 0xc7, 0x7b, 0x0f, 0x8f, 0xe3,
- 0xbd, 0xbf, 0x1f, 0xc7, 0x7b, 0x8b, 0x3e, 0xcd, 0xe0, 0xb7, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff,
- 0x71, 0x1f, 0x4d, 0x70, 0x81, 0x0a, 0x00, 0x00,
+ 0x10, 0xce, 0x38, 0xbb, 0xf6, 0xa4, 0x9c, 0x64, 0xa1, 0x59, 0x96, 0x66, 0x41, 0xa3, 0x68, 0x84,
+ 0x50, 0x0e, 0x28, 0x87, 0x65, 0xc5, 0x19, 0x87, 0x70, 0xb0, 0x64, 0x7e, 0x34, 0x09, 0x0f, 0xd0,
+ 0x9e, 0xa9, 0x38, 0x2d, 0xcf, 0x4c, 0x8f, 0x66, 0xda, 0xd9, 0xf8, 0x01, 0xb8, 0xf3, 0x30, 0x88,
+ 0x03, 0x47, 0x4e, 0x1c, 0x73, 0xe4, 0x88, 0x92, 0x17, 0x41, 0x55, 0x3d, 0xbf, 0x86, 0x03, 0x0f,
+ 0x90, 0x93, 0xfb, 0xfb, 0xaa, 0x5c, 0x55, 0x5d, 0x5d, 0x5f, 0x0d, 0x1c, 0x29, 0x6d, 0x62, 0x54,
+ 0xf9, 0x59, 0x51, 0x1a, 0x6b, 0x84, 0xcf, 0x3f, 0x59, 0xb5, 0x0a, 0x7f, 0x1b, 0x03, 0x7c, 0x5b,
+ 0x5d, 0x28, 0xab, 0xce, 0x55, 0x85, 0xe2, 0x18, 0x46, 0x3a, 0x91, 0xde, 0x89, 0x77, 0x7a, 0x10,
+ 0x8d, 0x74, 0x22, 0x5e, 0x83, 0x1f, 0xab, 0x0c, 0x4b, 0x35, 0x4f, 0xe4, 0x88, 0xd9, 0x16, 0x8b,
+ 0x00, 0xc0, 0x9d, 0xbf, 0x57, 0x19, 0xca, 0x7d, 0xb6, 0xf6, 0x98, 0xce, 0x3e, 0x4b, 0x92, 0x52,
+ 0x3e, 0xeb, 0xdb, 0x89, 0x11, 0x9f, 0xc1, 0x91, 0xca, 0x55, 0xba, 0xbd, 0xc4, 0xf2, 0x16, 0xcb,
+ 0x79, 0x22, 0x9f, 0xb3, 0xcb, 0x90, 0x14, 0xa7, 0xf0, 0xa2, 0x47, 0x70, 0xaa, 0x31, 0xfb, 0xed,
+ 0xd2, 0xbb, 0xf1, 0x0a, 0x39, 0xf9, 0x77, 0xbc, 0x42, 0x7c, 0x0a, 0x07, 0x71, 0xba, 0xa9, 0x2c,
+ 0x67, 0xf4, 0xd9, 0xa3, 0x23, 0xc4, 0x2b, 0x18, 0x5b, 0x55, 0xad, 0xe7, 0x89, 0x3c, 0x60, 0x53,
+ 0x8d, 0xa8, 0x0f, 0x74, 0xe2, 0xf4, 0xe0, 0xfa, 0xd0, 0x60, 0x21, 0x61, 0x52, 0x25, 0xce, 0x34,
+ 0x65, 0x53, 0x03, 0x29, 0x57, 0xa1, 0xe3, 0xef, 0xd4, 0xdd, 0x4f, 0x65, 0x2a, 0x0f, 0x5d, 0xae,
+ 0x96, 0xa0, 0x98, 0xb7, 0x3a, 0x41, 0x43, 0xc6, 0x23, 0x17, 0xb3, 0xc1, 0x14, 0xb3, 0xd0, 0xf1,
+ 0x85, 0xb2, 0x28, 0x8f, 0x5d, 0xcc, 0x1a, 0x8a, 0xb7, 0x00, 0x56, 0x95, 0x2b, 0xb4, 0xf3, 0xfc,
+ 0xda, 0xc8, 0x17, 0x27, 0xfb, 0xa7, 0xd3, 0x37, 0x2f, 0xcf, 0x9a, 0xf7, 0x3c, 0xbb, 0x6a, 0x6d,
+ 0x51, 0xcf, 0x4f, 0x9c, 0xc0, 0xd4, 0xd8, 0x1b, 0x2c, 0x17, 0x6a, 0x89, 0x69, 0x25, 0xdf, 0xe3,
+ 0x98, 0x7d, 0x8a, 0x5e, 0xab, 0xba, 0x31, 0xef, 0x6a, 0x87, 0xf7, 0xdd, 0x6b, 0x75, 0x0c, 0x55,
+ 0x9b, 0xea, 0x35, 0x72, 0x49, 0xc2, 0x55, 0xdb, 0x60, 0x71, 0x06, 0xfe, 0x52, 0x55, 0xc8, 0x15,
+ 0x7d, 0xc0, 0x15, 0x89, 0xae, 0xa2, 0xf3, 0xda, 0x12, 0xb5, 0x3e, 0x74, 0x3b, 0x5d, 0xcd, 0x52,
+ 0x55, 0x66, 0xf2, 0xe5, 0x89, 0x77, 0xea, 0x47, 0x0d, 0xa4, 0x2a, 0x74, 0x35, 0x8b, 0xd7, 0xce,
+ 0xf8, 0x21, 0x1b, 0x7b, 0x0c, 0xdd, 0x5e, 0xd1, 0x21, 0xda, 0xa4, 0x58, 0xc9, 0x57, 0xbb, 0xb7,
+ 0x9f, 0xb5, 0xb6, 0xa8, 0xe7, 0x47, 0xef, 0xa0, 0xab, 0x6f, 0x4c, 0x9a, 0x62, 0x6c, 0xe5, 0x47,
+ 0x1c, 0xb4, 0x23, 0xe8, 0x66, 0xba, 0xba, 0xc0, 0x14, 0x2d, 0x4a, 0xc9, 0xc6, 0x16, 0x53, 0xa5,
+ 0xb1, 0xc9, 0x2d, 0xe6, 0x56, 0x7e, 0xec, 0xde, 0xa1, 0x86, 0xe1, 0xcf, 0x13, 0x98, 0xcc, 0xe6,
+ 0x3f, 0x90, 0xa8, 0x9e, 0x54, 0xf3, 0xa4, 0x9a, 0x27, 0xd5, 0xfc, 0x1f, 0xd5, 0x90, 0x25, 0xd5,
+ 0xf9, 0xfa, 0x4a, 0xad, 0xe4, 0x6b, 0x67, 0xa9, 0xa1, 0xf8, 0x0a, 0xa6, 0xf5, 0x91, 0x1b, 0xf2,
+ 0xc9, 0x6e, 0x91, 0xdd, 0x47, 0x2a, 0xea, 0x3b, 0x86, 0x7f, 0x78, 0x00, 0xdd, 0xf3, 0xb9, 0x91,
+ 0x63, 0xd4, 0x08, 0xb2, 0xc5, 0xf4, 0x9c, 0xee, 0x7c, 0x19, 0x9b, 0x12, 0x59, 0x99, 0xa3, 0xa8,
+ 0x4f, 0x51, 0x79, 0xd7, 0xa8, 0xec, 0xa6, 0x6c, 0x94, 0xd9, 0x40, 0x8a, 0x5b, 0xe8, 0xf8, 0x32,
+ 0xa3, 0xb1, 0x73, 0xa2, 0x6c, 0xb1, 0xf8, 0x1a, 0x8e, 0x5d, 0x90, 0x85, 0x89, 0x95, 0xd5, 0x26,
+ 0x67, 0x4d, 0x4e, 0xdf, 0xc8, 0xdd, 0x01, 0x6b, 0xec, 0xd1, 0x8e, 0x7f, 0x68, 0xe1, 0x78, 0xe8,
+ 0x21, 0xbe, 0x80, 0x89, 0x35, 0xc5, 0x02, 0xaf, 0x2d, 0x5f, 0x63, 0x30, 0x1b, 0x6d, 0x98, 0xc6,
+ 0x45, 0xbc, 0x85, 0xe9, 0xd2, 0x58, 0x6b, 0xb2, 0x48, 0xaf, 0x6e, 0x2c, 0xdf, 0xec, 0xbf, 0xff,
+ 0xd1, 0x77, 0x0b, 0x3f, 0x07, 0xbf, 0xcd, 0x77, 0x08, 0xde, 0x1d, 0x67, 0x1a, 0x45, 0xde, 0x1d,
+ 0xa1, 0x6d, 0xdd, 0x1f, 0x6f, 0x1b, 0xfe, 0xee, 0x01, 0x74, 0x33, 0x42, 0x4d, 0x5a, 0x95, 0x66,
+ 0x53, 0xb4, 0x1d, 0x6e, 0x20, 0xcd, 0x21, 0xcf, 0xcf, 0x02, 0x6f, 0x31, 0xad, 0x37, 0x5f, 0x8f,
+ 0xa1, 0x26, 0x96, 0x9b, 0x14, 0xaf, 0xf0, 0xce, 0xd6, 0xfd, 0x6d, 0xb1, 0x08, 0xe1, 0x30, 0xc1,
+ 0x6b, 0xcc, 0x63, 0xbc, 0xb4, 0xa4, 0x96, 0x67, 0x3c, 0x53, 0x03, 0x8e, 0xf6, 0x8c, 0xae, 0x16,
+ 0x3a, 0x5f, 0x73, 0x83, 0xfd, 0xa8, 0x46, 0x4e, 0x65, 0xf9, 0x9a, 0x07, 0x67, 0xdc, 0xa8, 0xcc,
+ 0xe1, 0xf0, 0xd7, 0x11, 0xf8, 0xe7, 0x3d, 0x09, 0x59, 0xb5, 0x4c, 0xb1, 0x2b, 0xbd, 0x86, 0x34,
+ 0xec, 0x7c, 0xe4, 0x85, 0xe4, 0x2a, 0xef, 0x08, 0x2a, 0x2e, 0x36, 0x59, 0xa1, 0x4a, 0x74, 0xa3,
+ 0xb3, 0xcf, 0xad, 0x19, 0x70, 0x54, 0xdc, 0xf2, 0xdd, 0xd5, 0xb6, 0xc0, 0x7a, 0x3e, 0x6a, 0x34,
+ 0x98, 0xc8, 0xe7, 0x3b, 0x13, 0x19, 0x34, 0x6b, 0xa9, 0xb7, 0xa1, 0x7b, 0x0c, 0xe5, 0x75, 0xe8,
+ 0x47, 0x1d, 0xd3, 0xe4, 0xb9, 0xdd, 0x3c, 0xe0, 0xc8, 0x27, 0x33, 0xb9, 0xb6, 0xa6, 0x74, 0x6d,
+ 0x77, 0xdb, 0x79, 0xc0, 0x51, 0x6d, 0xa9, 0x5b, 0x51, 0xf5, 0x82, 0x76, 0xa8, 0x2f, 0x54, 0x18,
+ 0x08, 0xf5, 0x5c, 0xfe, 0xf9, 0x10, 0x78, 0xf7, 0x0f, 0x81, 0xf7, 0xf7, 0x43, 0xe0, 0xfd, 0xf2,
+ 0x18, 0xec, 0xdd, 0x3f, 0x06, 0x7b, 0x7f, 0x3d, 0x06, 0x7b, 0xcb, 0x31, 0x4f, 0xd5, 0x97, 0xff,
+ 0x04, 0x00, 0x00, 0xff, 0xff, 0x90, 0x68, 0x92, 0xe0, 0x53, 0x0a, 0x00, 0x00,
}
func (m *EsDataBase) Marshal() (dAtA []byte, err error) {
@@ -1658,59 +1640,47 @@
encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.CompareScore))))
i += 4
}
- if len(m.PersonId) > 0 {
+ if len(m.BwType) > 0 {
dAtA[i] = 0x22
i++
- i = encodeVarintAiocean(dAtA, i, uint64(len(m.PersonId)))
- i += copy(dAtA[i:], m.PersonId)
+ i = encodeVarintAiocean(dAtA, i, uint64(len(m.BwType)))
+ i += copy(dAtA[i:], m.BwType)
}
- if len(m.PersonName) > 0 {
+ if len(m.TargetId) > 0 {
dAtA[i] = 0x2a
i++
- i = encodeVarintAiocean(dAtA, i, uint64(len(m.PersonName)))
- i += copy(dAtA[i:], m.PersonName)
+ i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetId)))
+ i += copy(dAtA[i:], m.TargetId)
}
- if len(m.PersonPicUrl) > 0 {
+ if len(m.TargetName) > 0 {
dAtA[i] = 0x32
i++
- i = encodeVarintAiocean(dAtA, i, uint64(len(m.PersonPicUrl)))
- i += copy(dAtA[i:], m.PersonPicUrl)
+ i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetName)))
+ i += copy(dAtA[i:], m.TargetName)
}
- if len(m.PhoneNum) > 0 {
+ if len(m.TargetPicUrl) > 0 {
dAtA[i] = 0x3a
i++
- i = encodeVarintAiocean(dAtA, i, uint64(len(m.PhoneNum)))
- i += copy(dAtA[i:], m.PhoneNum)
- }
- if len(m.Sex) > 0 {
- dAtA[i] = 0x42
- i++
- i = encodeVarintAiocean(dAtA, i, uint64(len(m.Sex)))
- i += copy(dAtA[i:], m.Sex)
- }
- if len(m.IdCard) > 0 {
- dAtA[i] = 0x4a
- i++
- i = encodeVarintAiocean(dAtA, i, uint64(len(m.IdCard)))
- i += copy(dAtA[i:], m.IdCard)
+ i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetPicUrl)))
+ i += copy(dAtA[i:], m.TargetPicUrl)
}
if len(m.MonitorLevel) > 0 {
- dAtA[i] = 0x52
+ dAtA[i] = 0x42
i++
i = encodeVarintAiocean(dAtA, i, uint64(len(m.MonitorLevel)))
i += copy(dAtA[i:], m.MonitorLevel)
}
+ if len(m.Labels) > 0 {
+ dAtA[i] = 0x4a
+ i++
+ i = encodeVarintAiocean(dAtA, i, uint64(len(m.Labels)))
+ i += copy(dAtA[i:], m.Labels)
+ }
if len(m.Content) > 0 {
- dAtA[i] = 0x5a
+ dAtA[i] = 0x52
i++
i = encodeVarintAiocean(dAtA, i, uint64(len(m.Content)))
i += copy(dAtA[i:], m.Content)
- }
- if len(m.BwType) > 0 {
- dAtA[i] = 0x62
- i++
- i = encodeVarintAiocean(dAtA, i, uint64(len(m.BwType)))
- i += copy(dAtA[i:], m.BwType)
}
return i, nil
}
@@ -2064,27 +2034,19 @@
if m.CompareScore != 0 {
n += 5
}
- l = len(m.PersonId)
+ l = len(m.BwType)
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
- l = len(m.PersonName)
+ l = len(m.TargetId)
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
- l = len(m.PersonPicUrl)
+ l = len(m.TargetName)
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
- l = len(m.PhoneNum)
- if l > 0 {
- n += 1 + l + sovAiocean(uint64(l))
- }
- l = len(m.Sex)
- if l > 0 {
- n += 1 + l + sovAiocean(uint64(l))
- }
- l = len(m.IdCard)
+ l = len(m.TargetPicUrl)
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
@@ -2092,11 +2054,11 @@
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
- l = len(m.Content)
+ l = len(m.Labels)
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
- l = len(m.BwType)
+ l = len(m.Content)
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
@@ -4520,7 +4482,7 @@
m.CompareScore = float32(math.Float32frombits(v))
case 4:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field PersonId", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field BwType", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@@ -4548,11 +4510,11 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.PersonId = string(dAtA[iNdEx:postIndex])
+ m.BwType = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 5:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field PersonName", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field TargetId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@@ -4580,11 +4542,11 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.PersonName = string(dAtA[iNdEx:postIndex])
+ m.TargetId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 6:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field PersonPicUrl", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field TargetName", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@@ -4612,11 +4574,11 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.PersonPicUrl = string(dAtA[iNdEx:postIndex])
+ m.TargetName = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 7:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field PhoneNum", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field TargetPicUrl", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@@ -4644,73 +4606,9 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.PhoneNum = string(dAtA[iNdEx:postIndex])
+ m.TargetPicUrl = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 8:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Sex", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowAiocean
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthAiocean
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthAiocean
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Sex = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 9:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field IdCard", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowAiocean
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthAiocean
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthAiocean
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.IdCard = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 10:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field MonitorLevel", wireType)
}
@@ -4742,7 +4640,39 @@
}
m.MonitorLevel = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 11:
+ case 9:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Labels", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowAiocean
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ stringLen |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ intStringLen := int(stringLen)
+ if intStringLen < 0 {
+ return ErrInvalidLengthAiocean
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthAiocean
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Labels = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 10:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Content", wireType)
}
@@ -4773,38 +4703,6 @@
return io.ErrUnexpectedEOF
}
m.Content = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 12:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field BwType", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowAiocean
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthAiocean
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthAiocean
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.BwType = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
diff --git a/aiocean.proto b/aiocean.proto
index 5c21469..5d4b6f5 100644
--- a/aiocean.proto
+++ b/aiocean.proto
@@ -92,13 +92,11 @@
string tableId =1;
string tableName =2;
float compareScore =3;
- string personId =4;
- string personName =5;
- string personPicUrl =6;
- string phoneNum =7;
- string sex =8;
- string idCard =9;
- string monitorLevel =10;
- string content =11;
- string bwType =12;
+ string bwType =4;
+ string targetId =5;
+ string targetName =6;
+ string targetPicUrl =7;
+ string monitorLevel =8;
+ string labels =9;
+ string content =10;
}
--
Gitblit v1.8.0