From c1105ad8821c7794aeefd0c756a9ec8c0f4c7b91 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 20 十一月 2019 20:46:14 +0800
Subject: [PATCH] add targetType
---
aiocean.proto | 9 +-
aiocean.pb.go | 175 ++++++++++++++++++++++++++++---------------
2 files changed, 118 insertions(+), 66 deletions(-)
diff --git a/aiocean.pb.go b/aiocean.pb.go
index d4d382d..c252110 100644
--- a/aiocean.pb.go
+++ b/aiocean.pb.go
@@ -513,10 +513,11 @@
type TargetInfo struct {
TargetId string `protobuf:"bytes,1,opt,name=targetId,proto3" json:"targetId,omitempty"`
- TargetScore float64 `protobuf:"fixed64,2,opt,name=targetScore,proto3" json:"targetScore,omitempty"`
- Feature string `protobuf:"bytes,3,opt,name=feature,proto3" json:"feature,omitempty"`
- PicSmUrl string `protobuf:"bytes,4,opt,name=picSmUrl,proto3" json:"picSmUrl,omitempty"`
- TargetLocation *TargetLocation `protobuf:"bytes,5,opt,name=targetLocation,proto3" json:"targetLocation,omitempty"`
+ TargetType string `protobuf:"bytes,2,opt,name=targetType,proto3" json:"targetType,omitempty"`
+ TargetScore float64 `protobuf:"fixed64,3,opt,name=targetScore,proto3" json:"targetScore,omitempty"`
+ Feature string `protobuf:"bytes,4,opt,name=feature,proto3" json:"feature,omitempty"`
+ PicSmUrl string `protobuf:"bytes,5,opt,name=picSmUrl,proto3" json:"picSmUrl,omitempty"`
+ TargetLocation *TargetLocation `protobuf:"bytes,6,opt,name=targetLocation,proto3" json:"targetLocation,omitempty"`
}
func (m *TargetInfo) Reset() { *m = TargetInfo{} }
@@ -555,6 +556,13 @@
func (m *TargetInfo) GetTargetId() string {
if m != nil {
return m.TargetId
+ }
+ return ""
+}
+
+func (m *TargetInfo) GetTargetType() string {
+ if m != nil {
+ return m.TargetType
}
return ""
}
@@ -904,59 +912,60 @@
func init() { proto.RegisterFile("aiocean.proto", fileDescriptor_e7fb370e860fe148) }
var fileDescriptor_e7fb370e860fe148 = []byte{
- // 831 bytes of a gzipped FileDescriptorProto
+ // 835 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x55, 0xcd, 0x6e, 0x23, 0x45,
- 0x10, 0xce, 0x24, 0xbb, 0xf6, 0xa4, 0x9c, 0x64, 0xa1, 0x59, 0x96, 0x66, 0x41, 0x23, 0x6b, 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, 0x2b, 0x6d, 0x62, 0x54,
- 0xf9, 0x59, 0x51, 0x1a, 0x6b, 0x84, 0xcf, 0x3f, 0x59, 0xb5, 0x0a, 0x7f, 0x1b, 0x01, 0x7c, 0x5b,
- 0x5d, 0x28, 0xab, 0xce, 0x55, 0x85, 0xe2, 0x04, 0xf6, 0x75, 0x22, 0xbd, 0xa9, 0x77, 0x7a, 0x18,
- 0xed, 0xeb, 0x44, 0xbc, 0x06, 0x3f, 0x56, 0x19, 0x96, 0x6a, 0x9e, 0xc8, 0x7d, 0x66, 0x5b, 0x2c,
- 0x02, 0x00, 0x77, 0xfe, 0x5e, 0x65, 0x28, 0x0f, 0xd8, 0xda, 0x63, 0x3a, 0xfb, 0x2c, 0x49, 0x4a,
- 0xf9, 0xac, 0x6f, 0x27, 0x46, 0x7c, 0x06, 0xc7, 0x2a, 0x57, 0xe9, 0xf6, 0x12, 0xcb, 0x5b, 0x2c,
- 0xe7, 0x89, 0x7c, 0xce, 0x2e, 0x43, 0x52, 0x9c, 0xc2, 0x8b, 0x1e, 0xc1, 0xa9, 0x46, 0xec, 0xb7,
- 0x4b, 0xef, 0xc6, 0x2b, 0xe4, 0xf8, 0xdf, 0xf1, 0x0a, 0xf1, 0x29, 0x1c, 0xc6, 0xe9, 0xa6, 0xb2,
- 0x9c, 0xd1, 0x67, 0x8f, 0x8e, 0x10, 0xaf, 0x60, 0x64, 0x55, 0xb5, 0x9e, 0x27, 0xf2, 0x90, 0x4d,
- 0x35, 0xa2, 0x3e, 0xd0, 0x89, 0xd3, 0x83, 0xeb, 0x43, 0x83, 0x85, 0x84, 0x71, 0x95, 0x38, 0xd3,
- 0x84, 0x4d, 0x0d, 0xa4, 0x5c, 0x85, 0x8e, 0xbf, 0x53, 0x77, 0x3f, 0x95, 0xa9, 0x3c, 0x9a, 0x1e,
- 0x50, 0xae, 0x96, 0xa0, 0x98, 0xb7, 0x3a, 0x41, 0x43, 0xc6, 0x63, 0x17, 0xb3, 0xc1, 0x14, 0xb3,
- 0xd0, 0xf1, 0x85, 0xb2, 0x28, 0x4f, 0x5c, 0xcc, 0x1a, 0x8a, 0xb7, 0x00, 0x56, 0x95, 0x2b, 0xb4,
- 0xf3, 0xfc, 0xda, 0xc8, 0x17, 0xd3, 0x83, 0xd3, 0xc9, 0x9b, 0x97, 0x67, 0xcd, 0x7b, 0x9e, 0x5d,
- 0xb5, 0xb6, 0xa8, 0xe7, 0x27, 0xa6, 0x30, 0x31, 0xf6, 0x06, 0xcb, 0x85, 0x5a, 0x62, 0x5a, 0xc9,
- 0xf7, 0x38, 0x66, 0x9f, 0xa2, 0xd7, 0xaa, 0x6e, 0xcc, 0xbb, 0xda, 0xe1, 0x7d, 0xf7, 0x5a, 0x1d,
- 0x43, 0xd5, 0xa6, 0x7a, 0x8d, 0x5c, 0x92, 0x70, 0xd5, 0x36, 0x58, 0x9c, 0x81, 0xbf, 0x54, 0x15,
- 0x72, 0x45, 0x1f, 0x70, 0x45, 0xa2, 0xab, 0xe8, 0xbc, 0xb6, 0x44, 0xad, 0x0f, 0xdd, 0x4e, 0x57,
- 0xb3, 0x54, 0x95, 0x99, 0x7c, 0x39, 0xf5, 0x4e, 0xfd, 0xa8, 0x81, 0x54, 0x85, 0xae, 0x66, 0xf1,
- 0xda, 0x19, 0x3f, 0x64, 0x63, 0x8f, 0xa1, 0xdb, 0x2b, 0x3a, 0x44, 0x9b, 0x14, 0x2b, 0xf9, 0x6a,
- 0xf7, 0xf6, 0xb3, 0xd6, 0x16, 0xf5, 0xfc, 0xe8, 0x1d, 0x74, 0xf5, 0x8d, 0x49, 0x53, 0x8c, 0xad,
- 0xfc, 0x88, 0x83, 0x76, 0x04, 0xdd, 0x4c, 0x57, 0x17, 0x98, 0xa2, 0x45, 0x29, 0xd9, 0xd8, 0x62,
- 0xaa, 0x34, 0x36, 0xb9, 0xc5, 0xdc, 0xca, 0x8f, 0xdd, 0x3b, 0xd4, 0x30, 0xfc, 0x79, 0x0c, 0xe3,
+ 0x10, 0xce, 0x24, 0xbb, 0xb6, 0x53, 0x4e, 0xb2, 0xd0, 0x2c, 0x4b, 0xb3, 0x20, 0xcb, 0x1a, 0x21,
+ 0x94, 0x03, 0xca, 0x61, 0x59, 0x71, 0xc6, 0x21, 0x1c, 0x2c, 0x99, 0x1f, 0x4d, 0xc2, 0x03, 0xb4,
+ 0x67, 0x2a, 0x4e, 0xcb, 0x33, 0xd3, 0xa3, 0x99, 0x76, 0x36, 0x79, 0x00, 0xee, 0x3c, 0x0c, 0xe2,
+ 0xc0, 0x13, 0x70, 0xcc, 0x91, 0x23, 0x72, 0x5e, 0x04, 0x55, 0xf5, 0xfc, 0xf4, 0x18, 0x90, 0x78,
+ 0x80, 0x9c, 0xdc, 0xdf, 0x57, 0xe5, 0xaa, 0xea, 0xae, 0xfa, 0x6a, 0xe0, 0x58, 0x69, 0x13, 0xa3,
+ 0xca, 0xcf, 0x8a, 0xd2, 0x58, 0x23, 0x46, 0xfc, 0x93, 0x55, 0xab, 0xf0, 0xb7, 0x01, 0xc0, 0xb7,
+ 0xd5, 0x85, 0xb2, 0xea, 0x5c, 0x55, 0x28, 0x4e, 0x60, 0x5f, 0x27, 0x32, 0x98, 0x06, 0xa7, 0x87,
+ 0xd1, 0xbe, 0x4e, 0xc4, 0x6b, 0x18, 0xc5, 0x2a, 0xc3, 0x52, 0xcd, 0x13, 0xb9, 0xcf, 0x6c, 0x8b,
+ 0xc5, 0x04, 0xc0, 0x9d, 0xbf, 0x57, 0x19, 0xca, 0x03, 0xb6, 0x7a, 0x4c, 0x67, 0x9f, 0x25, 0x49,
+ 0x29, 0x9f, 0xf9, 0x76, 0x62, 0xc4, 0x67, 0x70, 0xac, 0x72, 0x95, 0xde, 0x5f, 0x62, 0x79, 0x8b,
+ 0xe5, 0x3c, 0x91, 0xcf, 0xd9, 0xa5, 0x4f, 0x8a, 0x53, 0x78, 0xe1, 0x11, 0x9c, 0x6a, 0xc0, 0x7e,
+ 0xbb, 0xf4, 0x6e, 0xbc, 0x42, 0x0e, 0xff, 0x19, 0xaf, 0x10, 0x9f, 0xc2, 0x61, 0x9c, 0x6e, 0x2a,
+ 0xcb, 0x19, 0x47, 0xec, 0xd1, 0x11, 0xe2, 0x15, 0x0c, 0xac, 0xaa, 0xd6, 0xf3, 0x44, 0x1e, 0xb2,
+ 0xa9, 0x46, 0xf4, 0x0e, 0x74, 0xe2, 0xf4, 0xe0, 0xde, 0xa1, 0xc1, 0x42, 0xc2, 0xb0, 0x4a, 0x9c,
+ 0x69, 0xcc, 0xa6, 0x06, 0x52, 0xae, 0x42, 0xc7, 0xdf, 0xa9, 0xbb, 0x9f, 0xca, 0x54, 0x1e, 0x4d,
+ 0x0f, 0x28, 0x57, 0x4b, 0x50, 0xcc, 0x5b, 0x9d, 0xa0, 0x21, 0xe3, 0xb1, 0x8b, 0xd9, 0x60, 0x8a,
+ 0x59, 0xe8, 0xf8, 0x42, 0x59, 0x94, 0x27, 0x2e, 0x66, 0x0d, 0xc5, 0x5b, 0x00, 0xab, 0xca, 0x15,
+ 0xda, 0x79, 0x7e, 0x6d, 0xe4, 0x8b, 0xe9, 0xc1, 0xe9, 0xf8, 0xcd, 0xcb, 0xb3, 0xa6, 0x9f, 0x67,
+ 0x57, 0xad, 0x2d, 0xf2, 0xfc, 0xc4, 0x14, 0xc6, 0xc6, 0xde, 0x60, 0xb9, 0x50, 0x4b, 0x4c, 0x2b,
+ 0xf9, 0x1e, 0xc7, 0xf4, 0x29, 0xea, 0x56, 0x75, 0x63, 0xde, 0xd5, 0x0e, 0xef, 0xbb, 0x6e, 0x75,
+ 0x0c, 0x55, 0x9b, 0xea, 0x35, 0x72, 0x49, 0xc2, 0x55, 0xdb, 0x60, 0x71, 0x06, 0xa3, 0xa5, 0xaa,
+ 0x90, 0x2b, 0xfa, 0x80, 0x2b, 0x12, 0x5d, 0x45, 0xe7, 0xb5, 0x25, 0x6a, 0x7d, 0xe8, 0x76, 0xba,
+ 0x9a, 0xa5, 0xaa, 0xcc, 0xe4, 0xcb, 0x69, 0x70, 0x3a, 0x8a, 0x1a, 0x48, 0x55, 0xe8, 0x6a, 0x16,
+ 0xaf, 0x9d, 0xf1, 0x43, 0x36, 0x7a, 0x0c, 0xdd, 0x5e, 0xd1, 0x21, 0xda, 0xa4, 0x58, 0xc9, 0x57,
+ 0xbb, 0xb7, 0x9f, 0xb5, 0xb6, 0xc8, 0xf3, 0xa3, 0x3e, 0xe8, 0xea, 0x1b, 0x93, 0xa6, 0x18, 0x5b,
+ 0xf9, 0x11, 0x07, 0xed, 0x08, 0xba, 0x99, 0xae, 0x2e, 0x30, 0x45, 0x8b, 0x52, 0xb2, 0xb1, 0xc5,
+ 0x54, 0x69, 0x6c, 0x72, 0x8b, 0xb9, 0x95, 0x1f, 0xbb, 0x3e, 0xd4, 0x30, 0xfc, 0x79, 0x08, 0xc3,
0xd9, 0xfc, 0x07, 0x12, 0xd5, 0x93, 0x6a, 0x9e, 0x54, 0xf3, 0xa4, 0x9a, 0xff, 0xa3, 0x1a, 0xb2,
- 0xa4, 0x3a, 0x5f, 0x5f, 0xa9, 0x95, 0x7c, 0xed, 0x2c, 0x35, 0x14, 0x5f, 0xc1, 0xa4, 0x3e, 0x72,
- 0x43, 0x3e, 0xd9, 0x2d, 0xb2, 0xfb, 0x48, 0x45, 0x7d, 0xc7, 0xf0, 0x0f, 0x0f, 0xa0, 0x7b, 0x3e,
- 0x37, 0x72, 0x8c, 0x1a, 0x41, 0xb6, 0x98, 0x9e, 0xd3, 0x9d, 0x2f, 0x63, 0x53, 0x22, 0x2b, 0xd3,
- 0x8b, 0xfa, 0x14, 0x95, 0x77, 0x8d, 0xca, 0x6e, 0xca, 0x46, 0x99, 0x0d, 0xa4, 0xb8, 0x85, 0x8e,
- 0x2f, 0x33, 0x1a, 0x3b, 0x27, 0xca, 0x16, 0x8b, 0xaf, 0xe1, 0xc4, 0x05, 0x59, 0x98, 0x58, 0x59,
- 0x6d, 0x72, 0xd6, 0xe4, 0xe4, 0x8d, 0xdc, 0x1d, 0xb0, 0xc6, 0x1e, 0xed, 0xf8, 0x87, 0x16, 0x4e,
- 0x86, 0x1e, 0xe2, 0x0b, 0x18, 0x5b, 0x53, 0x2c, 0xf0, 0xda, 0xf2, 0x35, 0x06, 0xb3, 0xd1, 0x86,
- 0x69, 0x5c, 0xc4, 0x5b, 0x98, 0x2c, 0x8d, 0xb5, 0x26, 0x8b, 0xf4, 0xea, 0xc6, 0xf2, 0xcd, 0xfe,
- 0xfb, 0x1f, 0x7d, 0xb7, 0xf0, 0x73, 0xf0, 0xdb, 0x7c, 0x47, 0xe0, 0xdd, 0x71, 0x26, 0x2f, 0xf2,
- 0xee, 0x08, 0x6d, 0xeb, 0xfe, 0x78, 0xdb, 0xf0, 0x77, 0x0f, 0xa0, 0x9b, 0x11, 0x6a, 0xd2, 0xaa,
- 0x34, 0x9b, 0xa2, 0xed, 0x70, 0x03, 0x69, 0x0e, 0x79, 0x7e, 0x16, 0x78, 0x8b, 0x69, 0xbd, 0xf9,
- 0x7a, 0x0c, 0x35, 0xb1, 0xdc, 0xa4, 0x78, 0x85, 0x77, 0xb6, 0xee, 0x6f, 0x8b, 0x45, 0x08, 0x47,
- 0x09, 0x5e, 0x63, 0x1e, 0xe3, 0xa5, 0x25, 0xb5, 0x3c, 0xe3, 0x99, 0x1a, 0x70, 0xb4, 0x67, 0x74,
- 0xb5, 0xd0, 0xf9, 0x9a, 0x1b, 0xec, 0x47, 0x35, 0x72, 0x2a, 0xcb, 0xd7, 0x3c, 0x38, 0xa3, 0x46,
- 0x65, 0x0e, 0x87, 0xbf, 0xee, 0x83, 0x7f, 0xde, 0x93, 0x90, 0x55, 0xcb, 0x14, 0xbb, 0xd2, 0x6b,
- 0x48, 0xc3, 0xce, 0x47, 0x5e, 0x48, 0xae, 0xf2, 0x8e, 0xa0, 0xe2, 0x62, 0x93, 0x15, 0xaa, 0x44,
- 0x37, 0x3a, 0x07, 0xdc, 0x9a, 0x01, 0x47, 0xc5, 0x2d, 0xdf, 0x5d, 0x6d, 0x0b, 0xac, 0xe7, 0xa3,
- 0x46, 0x83, 0x89, 0x7c, 0xbe, 0x33, 0x91, 0x41, 0xb3, 0x96, 0x7a, 0x1b, 0xba, 0xc7, 0x50, 0x5e,
- 0x87, 0x7e, 0xd4, 0x31, 0x4d, 0x9e, 0xdb, 0xcd, 0x03, 0x8e, 0x7c, 0x32, 0x93, 0x6b, 0x6b, 0x4a,
- 0xd7, 0x76, 0xb7, 0x9d, 0x07, 0x1c, 0xd5, 0x96, 0xba, 0x15, 0x55, 0x2f, 0x68, 0x87, 0xfa, 0x42,
- 0x85, 0x81, 0x50, 0xcf, 0xe5, 0x9f, 0x0f, 0x81, 0x77, 0xff, 0x10, 0x78, 0x7f, 0x3f, 0x04, 0xde,
- 0x2f, 0x8f, 0xc1, 0xde, 0xfd, 0x63, 0xb0, 0xf7, 0xd7, 0x63, 0xb0, 0xb7, 0x1c, 0xf1, 0x54, 0x7d,
- 0xf9, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x81, 0xc1, 0x13, 0x68, 0x53, 0x0a, 0x00, 0x00,
+ 0xa4, 0x3a, 0x5f, 0x5f, 0xa9, 0x95, 0x7c, 0xed, 0x2c, 0x35, 0x14, 0x5f, 0xc1, 0xb8, 0x3e, 0xf2,
+ 0x83, 0x7c, 0xb2, 0x5b, 0x64, 0xf7, 0x91, 0x8a, 0x7c, 0xc7, 0x70, 0x1b, 0x00, 0x74, 0xed, 0x73,
+ 0x23, 0xc7, 0xa8, 0x11, 0x64, 0x8b, 0xe9, 0x99, 0xdc, 0xf9, 0xea, 0xbe, 0xc0, 0x5a, 0x98, 0x1e,
+ 0x43, 0xed, 0x76, 0xe8, 0x32, 0x36, 0xa5, 0xd3, 0x66, 0x10, 0xf9, 0x14, 0x95, 0x7f, 0x8d, 0xca,
+ 0x6e, 0x4a, 0xac, 0x95, 0xd9, 0x40, 0xca, 0x5b, 0xe8, 0xf8, 0x32, 0xa3, 0xb1, 0x74, 0x8a, 0x6c,
+ 0xb1, 0xf8, 0x1a, 0x4e, 0x5c, 0x90, 0x85, 0x89, 0x95, 0xd5, 0x26, 0x67, 0x2d, 0x8e, 0xdf, 0xc8,
+ 0xdd, 0x01, 0x6c, 0xec, 0xd1, 0x8e, 0x7f, 0x68, 0xe1, 0xa4, 0xef, 0x21, 0xbe, 0x80, 0xa1, 0x35,
+ 0xc5, 0x02, 0xaf, 0x2d, 0x5f, 0xb3, 0x37, 0x3b, 0x6d, 0x98, 0xc6, 0x45, 0xbc, 0x85, 0xf1, 0xd2,
+ 0x58, 0x6b, 0xb2, 0x48, 0xaf, 0x6e, 0x2c, 0x5f, 0xfd, 0xdf, 0xff, 0xe1, 0xbb, 0x85, 0x9f, 0xc3,
+ 0xa8, 0xcd, 0x77, 0x04, 0xc1, 0x1d, 0x67, 0x0a, 0xa2, 0xe0, 0x8e, 0xd0, 0x3d, 0x47, 0x09, 0xa2,
+ 0xe0, 0x3e, 0xfc, 0x3d, 0x00, 0xe8, 0x66, 0x88, 0x1e, 0x69, 0x55, 0x9a, 0x4d, 0xd1, 0x76, 0xa0,
+ 0x81, 0xd4, 0x00, 0x9e, 0xaf, 0x05, 0xde, 0x62, 0xda, 0x34, 0xa0, 0x63, 0xe8, 0x11, 0xcb, 0x4d,
+ 0x8a, 0x57, 0x78, 0x67, 0xeb, 0xcd, 0xd8, 0x62, 0x11, 0xc2, 0x51, 0x82, 0xd7, 0x98, 0xc7, 0x78,
+ 0x69, 0x49, 0x4d, 0xcf, 0x78, 0xe6, 0x7a, 0x1c, 0xed, 0x21, 0x5d, 0x2d, 0x74, 0xbe, 0xe6, 0x16,
+ 0x8c, 0xa2, 0x1a, 0x39, 0x15, 0xe6, 0x6b, 0x1e, 0xac, 0x41, 0xa3, 0x42, 0x87, 0xc3, 0x5f, 0xf7,
+ 0x61, 0x74, 0xee, 0x49, 0xcc, 0xaa, 0x65, 0x8a, 0x5d, 0xe9, 0x35, 0x24, 0x31, 0xf0, 0x91, 0x17,
+ 0x96, 0xab, 0xbc, 0x23, 0xa8, 0xb8, 0xd8, 0x64, 0x85, 0x2a, 0xd1, 0x1f, 0x9d, 0x1e, 0x47, 0xc5,
+ 0x2d, 0xdf, 0xf1, 0xe4, 0xb9, 0xd1, 0xa9, 0x51, 0x6f, 0x62, 0x9f, 0xff, 0xd7, 0xc4, 0x7a, 0x1b,
+ 0xdc, 0x63, 0x28, 0xaf, 0x43, 0x3f, 0xea, 0x98, 0x26, 0xcf, 0xed, 0xee, 0x1e, 0x47, 0x3e, 0x99,
+ 0xc9, 0xb5, 0x35, 0xa5, 0x7b, 0x76, 0xb7, 0xbd, 0x7b, 0x1c, 0xd5, 0x96, 0xba, 0x15, 0x56, 0x2f,
+ 0x70, 0x87, 0x7c, 0x21, 0x43, 0x4f, 0xc8, 0xe7, 0xf2, 0x8f, 0xed, 0x24, 0x78, 0xd8, 0x4e, 0x82,
+ 0xbf, 0xb6, 0x93, 0xe0, 0x97, 0xc7, 0xc9, 0xde, 0xc3, 0xe3, 0x64, 0xef, 0xcf, 0xc7, 0xc9, 0xde,
+ 0x72, 0xc0, 0x53, 0xf5, 0xe5, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x91, 0xae, 0xe0, 0x73,
+ 0x0a, 0x00, 0x00,
}
func (m *EsDataBase) Marshal() (dAtA []byte, err error) {
@@ -1464,26 +1473,32 @@
i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetId)))
i += copy(dAtA[i:], m.TargetId)
}
+ if len(m.TargetType) > 0 {
+ dAtA[i] = 0x12
+ i++
+ i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetType)))
+ i += copy(dAtA[i:], m.TargetType)
+ }
if m.TargetScore != 0 {
- dAtA[i] = 0x11
+ dAtA[i] = 0x19
i++
encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.TargetScore))))
i += 8
}
if len(m.Feature) > 0 {
- dAtA[i] = 0x1a
+ dAtA[i] = 0x22
i++
i = encodeVarintAiocean(dAtA, i, uint64(len(m.Feature)))
i += copy(dAtA[i:], m.Feature)
}
if len(m.PicSmUrl) > 0 {
- dAtA[i] = 0x22
+ dAtA[i] = 0x2a
i++
i = encodeVarintAiocean(dAtA, i, uint64(len(m.PicSmUrl)))
i += copy(dAtA[i:], m.PicSmUrl)
}
if m.TargetLocation != nil {
- dAtA[i] = 0x2a
+ dAtA[i] = 0x32
i++
i = encodeVarintAiocean(dAtA, i, uint64(m.TargetLocation.Size()))
n1, err1 := m.TargetLocation.MarshalTo(dAtA[i:])
@@ -1955,6 +1970,10 @@
var l int
_ = l
l = len(m.TargetId)
+ if l > 0 {
+ n += 1 + l + sovAiocean(uint64(l))
+ }
+ l = len(m.TargetType)
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
@@ -3843,6 +3862,38 @@
m.TargetId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field TargetType", 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.TargetType = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 3:
if wireType != 1 {
return fmt.Errorf("proto: wrong wireType = %d for field TargetScore", wireType)
}
@@ -3853,7 +3904,7 @@
v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:]))
iNdEx += 8
m.TargetScore = float64(math.Float64frombits(v))
- case 3:
+ case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Feature", wireType)
}
@@ -3885,7 +3936,7 @@
}
m.Feature = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 4:
+ case 5:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PicSmUrl", wireType)
}
@@ -3917,7 +3968,7 @@
}
m.PicSmUrl = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 5:
+ case 6:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TargetLocation", wireType)
}
diff --git a/aiocean.proto b/aiocean.proto
index 3539fbe..593d028 100644
--- a/aiocean.proto
+++ b/aiocean.proto
@@ -63,10 +63,11 @@
message TargetInfo {
string targetId =1;
- double targetScore =2;
- string feature =3;
- string picSmUrl =4;
- TargetLocation targetLocation =5;
+ string targetType =2;
+ double targetScore =3;
+ string feature =4;
+ string picSmUrl =5;
+ TargetLocation targetLocation =6;
}
message TargetLocation {
--
Gitblit v1.8.0