From 950d89112665bead13fa79ae7e37b8addc188ca8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 13 十月 2020 10:47:43 +0800
Subject: [PATCH] isTriggerByPreSdk set 0:非触发，1：必要触发，2：非必要触发
---
es.pb.go | 699 ++++++++++++++++++++++-----------------------------------
1 files changed, 268 insertions(+), 431 deletions(-)
diff --git a/es.pb.go b/es.pb.go
index f19eaae..014f371 100644
--- a/es.pb.go
+++ b/es.pb.go
@@ -30,6 +30,7 @@
CompareScore float32 `protobuf:"fixed32,4,opt,name=compareScore,proto3" json:"compareScore,omitempty"`
Enable int32 `protobuf:"varint,5,opt,name=enable,proto3" json:"enable,omitempty"`
AnalyServerId string `protobuf:"bytes,6,opt,name=analyServerId,proto3" json:"analyServerId,omitempty"`
+ CarNo string `protobuf:"bytes,7,opt,name=carNo,proto3" json:"carNo,omitempty"`
}
func (m *Esinfo) Reset() { *m = Esinfo{} }
@@ -107,92 +108,7 @@
return ""
}
-type PersonCar struct {
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
- Tableid string `protobuf:"bytes,2,opt,name=tableid,proto3" json:"tableid,omitempty"`
- FaceFeature string `protobuf:"bytes,3,opt,name=faceFeature,proto3" json:"faceFeature,omitempty"`
- CompareScore float32 `protobuf:"fixed32,4,opt,name=compareScore,proto3" json:"compareScore,omitempty"`
- Enable int32 `protobuf:"varint,5,opt,name=enable,proto3" json:"enable,omitempty"`
- AnalyServerId string `protobuf:"bytes,6,opt,name=analyServerId,proto3" json:"analyServerId,omitempty"`
- CarNo string `protobuf:"bytes,7,opt,name=carNo,proto3" json:"carNo,omitempty"`
-}
-
-func (m *PersonCar) Reset() { *m = PersonCar{} }
-func (m *PersonCar) String() string { return proto.CompactTextString(m) }
-func (*PersonCar) ProtoMessage() {}
-func (*PersonCar) Descriptor() ([]byte, []int) {
- return fileDescriptor_718db5c20d0f3738, []int{1}
-}
-func (m *PersonCar) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
-}
-func (m *PersonCar) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_PersonCar.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalTo(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
- }
-}
-func (m *PersonCar) XXX_Merge(src proto.Message) {
- xxx_messageInfo_PersonCar.Merge(m, src)
-}
-func (m *PersonCar) XXX_Size() int {
- return m.Size()
-}
-func (m *PersonCar) XXX_DiscardUnknown() {
- xxx_messageInfo_PersonCar.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_PersonCar proto.InternalMessageInfo
-
-func (m *PersonCar) GetId() string {
- if m != nil {
- return m.Id
- }
- return ""
-}
-
-func (m *PersonCar) GetTableid() string {
- if m != nil {
- return m.Tableid
- }
- return ""
-}
-
-func (m *PersonCar) GetFaceFeature() string {
- if m != nil {
- return m.FaceFeature
- }
- return ""
-}
-
-func (m *PersonCar) GetCompareScore() float32 {
- if m != nil {
- return m.CompareScore
- }
- return 0
-}
-
-func (m *PersonCar) GetEnable() int32 {
- if m != nil {
- return m.Enable
- }
- return 0
-}
-
-func (m *PersonCar) GetAnalyServerId() string {
- if m != nil {
- return m.AnalyServerId
- }
- return ""
-}
-
-func (m *PersonCar) GetCarNo() string {
+func (m *Esinfo) GetCarNo() string {
if m != nil {
return m.CarNo
}
@@ -211,7 +127,7 @@
func (m *MultiFeaCache) String() string { return proto.CompactTextString(m) }
func (*MultiFeaCache) ProtoMessage() {}
func (*MultiFeaCache) Descriptor() ([]byte, []int) {
- return fileDescriptor_718db5c20d0f3738, []int{2}
+ return fileDescriptor_718db5c20d0f3738, []int{1}
}
func (m *MultiFeaCache) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -286,7 +202,7 @@
func (m *LinkEsInfo) String() string { return proto.CompactTextString(m) }
func (*LinkEsInfo) ProtoMessage() {}
func (*LinkEsInfo) Descriptor() ([]byte, []int) {
- return fileDescriptor_718db5c20d0f3738, []int{3}
+ return fileDescriptor_718db5c20d0f3738, []int{2}
}
func (m *LinkEsInfo) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -361,13 +277,18 @@
MonitorLevel string `protobuf:"bytes,15,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"`
Enable int32 `protobuf:"varint,16,opt,name=enable,proto3" json:"enable,omitempty"`
Reserved string `protobuf:"bytes,17,opt,name=reserved,proto3" json:"reserved,omitempty"`
+ CarNo string `protobuf:"bytes,18,opt,name=carNo,proto3" json:"carNo,omitempty"`
+ CarPicUrls string `protobuf:"bytes,19,opt,name=carPicUrls,proto3" json:"carPicUrls,omitempty"`
+ CarType int32 `protobuf:"varint,20,opt,name=carType,proto3" json:"carType,omitempty"`
+ CarBrand int32 `protobuf:"varint,21,opt,name=carBrand,proto3" json:"carBrand,omitempty"`
+ CarColor int32 `protobuf:"varint,22,opt,name=carColor,proto3" json:"carColor,omitempty"`
}
func (m *Dbperson) Reset() { *m = Dbperson{} }
func (m *Dbperson) String() string { return proto.CompactTextString(m) }
func (*Dbperson) ProtoMessage() {}
func (*Dbperson) Descriptor() ([]byte, []int) {
- return fileDescriptor_718db5c20d0f3738, []int{4}
+ return fileDescriptor_718db5c20d0f3738, []int{3}
}
func (m *Dbperson) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -515,6 +436,41 @@
return ""
}
+func (m *Dbperson) GetCarNo() string {
+ if m != nil {
+ return m.CarNo
+ }
+ return ""
+}
+
+func (m *Dbperson) GetCarPicUrls() string {
+ if m != nil {
+ return m.CarPicUrls
+ }
+ return ""
+}
+
+func (m *Dbperson) GetCarType() int32 {
+ if m != nil {
+ return m.CarType
+ }
+ return 0
+}
+
+func (m *Dbperson) GetCarBrand() int32 {
+ if m != nil {
+ return m.CarBrand
+ }
+ return 0
+}
+
+func (m *Dbperson) GetCarColor() int32 {
+ if m != nil {
+ return m.CarColor
+ }
+ return 0
+}
+
type Dbtable struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
TableName string `protobuf:"bytes,2,opt,name=tableName,proto3" json:"tableName,omitempty"`
@@ -537,7 +493,7 @@
func (m *Dbtable) String() string { return proto.CompactTextString(m) }
func (*Dbtable) ProtoMessage() {}
func (*Dbtable) Descriptor() ([]byte, []int) {
- return fileDescriptor_718db5c20d0f3738, []int{5}
+ return fileDescriptor_718db5c20d0f3738, []int{4}
}
func (m *Dbtable) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -673,7 +629,6 @@
func init() {
proto.RegisterType((*Esinfo)(nil), "protomsg.Esinfo")
- proto.RegisterType((*PersonCar)(nil), "protomsg.PersonCar")
proto.RegisterType((*MultiFeaCache)(nil), "protomsg.MultiFeaCache")
proto.RegisterType((*LinkEsInfo)(nil), "protomsg.LinkEsInfo")
proto.RegisterType((*Dbperson)(nil), "protomsg.Dbperson")
@@ -683,51 +638,53 @@
func init() { proto.RegisterFile("es.proto", fileDescriptor_718db5c20d0f3738) }
var fileDescriptor_718db5c20d0f3738 = []byte{
- // 694 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x94, 0x41, 0x4e, 0xdb, 0x4e,
- 0x14, 0xc6, 0x71, 0x02, 0x49, 0xfc, 0x42, 0x80, 0xff, 0x08, 0xfd, 0x35, 0x42, 0x28, 0x8a, 0xa2,
- 0x2e, 0xb2, 0x62, 0x41, 0x7b, 0x80, 0x0a, 0x02, 0x52, 0x24, 0x8a, 0x90, 0xa1, 0x07, 0x98, 0x8c,
- 0x5f, 0x60, 0xd4, 0xd8, 0x63, 0x8d, 0x27, 0xb4, 0xb9, 0x45, 0xcf, 0xd1, 0x4d, 0x77, 0x3d, 0x43,
- 0x77, 0x65, 0xd9, 0x45, 0x17, 0x15, 0x1c, 0xa1, 0x17, 0xa8, 0x66, 0xc6, 0x8e, 0xed, 0x84, 0xd2,
- 0x76, 0xd9, 0x55, 0xf2, 0x7d, 0x9f, 0x3d, 0xf3, 0xe6, 0xfd, 0xde, 0x18, 0x5a, 0x98, 0x1e, 0x24,
- 0x4a, 0x6a, 0x49, 0x5a, 0xf6, 0x27, 0x4a, 0xaf, 0xf7, 0x3a, 0x4c, 0x48, 0x8e, 0x2c, 0x76, 0x41,
- 0xff, 0x93, 0x07, 0x8d, 0x93, 0x54, 0xc4, 0x13, 0x49, 0xb6, 0xa0, 0x26, 0x42, 0xea, 0xf5, 0xbc,
- 0x81, 0x1f, 0xd4, 0x44, 0x48, 0x28, 0x34, 0x35, 0x1b, 0x4f, 0x51, 0x84, 0xb4, 0x66, 0xcd, 0x5c,
- 0x92, 0x1e, 0xb4, 0x27, 0x8c, 0xe3, 0x29, 0x32, 0x3d, 0x53, 0x48, 0xeb, 0x36, 0x2d, 0x5b, 0xa4,
- 0x0f, 0x9b, 0x5c, 0x46, 0x09, 0x53, 0x78, 0xc9, 0xa5, 0x42, 0xba, 0xde, 0xf3, 0x06, 0xb5, 0xa0,
- 0xe2, 0x91, 0xff, 0xa1, 0x81, 0xb1, 0x59, 0x91, 0x6e, 0xf4, 0xbc, 0xc1, 0x46, 0x90, 0x29, 0xf2,
- 0x0c, 0x3a, 0x2c, 0x66, 0xd3, 0xf9, 0x25, 0xaa, 0x5b, 0x54, 0xa3, 0x90, 0x36, 0xec, 0xfa, 0x55,
- 0xb3, 0xff, 0xc5, 0x03, 0xff, 0x02, 0x55, 0x2a, 0xe3, 0x63, 0xa6, 0xfe, 0xad, 0xda, 0xc9, 0x2e,
- 0x6c, 0x70, 0xa6, 0xce, 0x25, 0x6d, 0xda, 0xd4, 0x89, 0xfe, 0x0f, 0x0f, 0x3a, 0xaf, 0x66, 0x53,
- 0x2d, 0x4e, 0x91, 0x1d, 0x33, 0x7e, 0x83, 0x64, 0x00, 0x0d, 0x4c, 0x47, 0xf1, 0x44, 0xda, 0x93,
- 0xb5, 0x0f, 0x77, 0x0e, 0x72, 0x8c, 0x07, 0x8e, 0x59, 0x90, 0xe5, 0x76, 0x5f, 0xad, 0x19, 0xbf,
- 0xc9, 0xcf, 0x55, 0xcb, 0xf6, 0x2d, 0x9b, 0x64, 0x0f, 0x5a, 0x9c, 0x45, 0xa8, 0xd8, 0x28, 0xcc,
- 0x0e, 0xbe, 0xd0, 0xe4, 0x05, 0xc0, 0x54, 0xc4, 0x6f, 0x4e, 0xdc, 0x7e, 0xeb, 0xbd, 0xfa, 0xa0,
- 0x7d, 0xb8, 0x5b, 0xec, 0x77, 0xb6, 0xc8, 0x82, 0xd2, 0x73, 0xe4, 0x25, 0x6c, 0x69, 0xa6, 0xae,
- 0x51, 0x9f, 0x49, 0xce, 0xb4, 0x90, 0xb1, 0xed, 0x47, 0xfb, 0x90, 0x16, 0x6f, 0x5e, 0x55, 0xf2,
- 0x60, 0xe9, 0xf9, 0xfe, 0x07, 0x0f, 0xa0, 0x58, 0xbc, 0x52, 0xa2, 0xb7, 0x54, 0x22, 0x85, 0xe6,
- 0xa4, 0x72, 0xbc, 0x5c, 0xae, 0x1e, 0xbf, 0xfe, 0xd8, 0xf1, 0x57, 0x8b, 0x5d, 0xff, 0xcb, 0x62,
- 0xbf, 0xd5, 0xa1, 0x35, 0x1c, 0x27, 0x76, 0xec, 0x7e, 0x39, 0x73, 0xa3, 0xea, 0xcc, 0x8d, 0xfe,
- 0x70, 0xe6, 0xdc, 0xaa, 0x17, 0x82, 0xbf, 0x56, 0x53, 0x5b, 0x98, 0x1f, 0x54, 0x3c, 0xd2, 0x05,
- 0x70, 0xfa, 0x9c, 0x45, 0x6e, 0xee, 0xfc, 0xa0, 0xe4, 0x90, 0x1d, 0xa8, 0xb3, 0x6b, 0xcc, 0x26,
- 0xce, 0xfc, 0x35, 0x4e, 0x8a, 0xef, 0xb2, 0x29, 0x33, 0x7f, 0xcd, 0xdc, 0x8a, 0xf0, 0x98, 0xa9,
- 0x90, 0xb6, 0xac, 0x99, 0x29, 0x53, 0x7b, 0x22, 0xf8, 0x10, 0x53, 0x4e, 0x7d, 0x57, 0x7b, 0x26,
- 0x0d, 0x90, 0xe4, 0x46, 0xc6, 0x78, 0x3e, 0x8b, 0x28, 0x38, 0x20, 0xb9, 0x36, 0x15, 0x71, 0x85,
- 0x4c, 0xe3, 0x95, 0x88, 0x90, 0xb6, 0x5d, 0x45, 0x85, 0x63, 0xf2, 0x59, 0x12, 0xe6, 0xf9, 0xa6,
- 0xcb, 0x0b, 0xc7, 0xc2, 0xb6, 0x4f, 0x1f, 0xcd, 0x69, 0x27, 0x83, 0x9d, 0x69, 0x93, 0x89, 0x74,
- 0x88, 0x53, 0xd4, 0x48, 0xb7, 0xec, 0x1d, 0x5b, 0x68, 0xd3, 0xad, 0x48, 0xc6, 0x42, 0x4b, 0x75,
- 0x86, 0xb7, 0x38, 0xa5, 0xdb, 0xae, 0x5b, 0x65, 0xaf, 0x74, 0x43, 0x77, 0x2a, 0x37, 0x74, 0x0f,
- 0x5a, 0x0a, 0x53, 0x73, 0x13, 0x43, 0xfa, 0x9f, 0xdb, 0x33, 0xd7, 0xfd, 0x8f, 0x75, 0x68, 0x0e,
- 0xc7, 0x96, 0xda, 0x0a, 0xdd, 0x7d, 0xf0, 0x6d, 0x60, 0x9b, 0xef, 0xf8, 0x16, 0xc6, 0x22, 0xb5,
- 0x1d, 0xac, 0x97, 0x52, 0xdb, 0xc3, 0x3c, 0xbd, 0x9a, 0x27, 0x98, 0xa1, 0x2d, 0x0c, 0x53, 0xe9,
- 0xf8, 0xad, 0x8d, 0x1c, 0xd3, 0x4c, 0x99, 0xb7, 0x52, 0xcd, 0x94, 0xb6, 0xcd, 0x73, 0x54, 0x0b,
- 0xc3, 0x10, 0xc3, 0x38, 0xb4, 0x99, 0xe3, 0x9b, 0xcb, 0x25, 0x2a, 0xad, 0xdf, 0x50, 0xf1, 0x9f,
- 0xa4, 0x02, 0x4f, 0x50, 0x69, 0x2f, 0x51, 0xd9, 0x07, 0x5f, 0xa4, 0xa7, 0x52, 0xe1, 0x2d, 0xaa,
- 0x0c, 0x76, 0x61, 0x94, 0x78, 0x74, 0x2a, 0x3c, 0xcc, 0x44, 0xa6, 0x97, 0xf3, 0x98, 0x5b, 0xca,
- 0x66, 0x22, 0xad, 0x5a, 0xfd, 0x92, 0x6e, 0x3f, 0xf2, 0x25, 0x3d, 0xa2, 0x9f, 0xef, 0xbb, 0xde,
- 0xdd, 0x7d, 0xd7, 0xfb, 0x7e, 0xdf, 0xf5, 0xde, 0x3f, 0x74, 0xd7, 0xee, 0x1e, 0xba, 0x6b, 0x5f,
- 0x1f, 0xba, 0x6b, 0xe3, 0x86, 0xbd, 0xd3, 0xcf, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x10, 0xd0,
- 0xf5, 0x4a, 0x04, 0x07, 0x00, 0x00,
+ // 732 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x4e, 0xdb, 0x4a,
+ 0x14, 0xc6, 0x49, 0xc8, 0xcf, 0x09, 0x01, 0xee, 0x5c, 0x2e, 0x1a, 0x21, 0x14, 0x45, 0xd1, 0x5d,
+ 0x64, 0xc5, 0x82, 0x7b, 0x1f, 0xa0, 0x82, 0x80, 0x14, 0x89, 0xa2, 0xca, 0xd0, 0x07, 0x98, 0x8c,
+ 0x4f, 0x60, 0x54, 0xc7, 0x13, 0x8d, 0x1d, 0xda, 0xbc, 0x45, 0x9f, 0xa3, 0x9b, 0xbe, 0x46, 0x17,
+ 0x5d, 0xb0, 0xec, 0xb2, 0x82, 0xbe, 0x41, 0x5f, 0xa0, 0x9a, 0x33, 0x76, 0x6c, 0x27, 0x94, 0xb6,
+ 0xab, 0xe4, 0xfb, 0x3e, 0x7b, 0xce, 0xf9, 0xe6, 0x7c, 0xc7, 0xd0, 0xc4, 0xf8, 0x68, 0x66, 0x74,
+ 0xa2, 0x59, 0x93, 0x7e, 0xa6, 0xf1, 0xcd, 0x41, 0x47, 0x28, 0x2d, 0x51, 0x44, 0x4e, 0xe8, 0x7f,
+ 0xf6, 0xa0, 0x7e, 0x16, 0xab, 0x68, 0xa2, 0xd9, 0x36, 0x54, 0x54, 0xc0, 0xbd, 0x9e, 0x37, 0x68,
+ 0xf9, 0x15, 0x15, 0x30, 0x0e, 0x8d, 0x44, 0x8c, 0x43, 0x54, 0x01, 0xaf, 0x10, 0x99, 0x41, 0xd6,
+ 0x83, 0xf6, 0x44, 0x48, 0x3c, 0x47, 0x91, 0xcc, 0x0d, 0xf2, 0x2a, 0xa9, 0x45, 0x8a, 0xf5, 0x61,
+ 0x4b, 0xea, 0xe9, 0x4c, 0x18, 0xbc, 0x92, 0xda, 0x20, 0xaf, 0xf5, 0xbc, 0x41, 0xc5, 0x2f, 0x71,
+ 0x6c, 0x1f, 0xea, 0x18, 0xd9, 0x13, 0xf9, 0x66, 0xcf, 0x1b, 0x6c, 0xfa, 0x29, 0x62, 0xff, 0x42,
+ 0x47, 0x44, 0x22, 0x5c, 0x5c, 0xa1, 0xb9, 0x43, 0x33, 0x0a, 0x78, 0x9d, 0xce, 0x2f, 0x93, 0x6c,
+ 0x0f, 0x36, 0xa5, 0x30, 0x97, 0x9a, 0x37, 0x48, 0x75, 0xa0, 0xff, 0xdd, 0x83, 0xce, 0xcb, 0x79,
+ 0x98, 0xa8, 0x73, 0x14, 0xa7, 0x42, 0xde, 0x22, 0x1b, 0x40, 0x1d, 0xe3, 0x51, 0x34, 0xd1, 0xe4,
+ 0xac, 0x7d, 0xbc, 0x7b, 0x94, 0x5d, 0xc5, 0x91, 0xf3, 0xed, 0xa7, 0x3a, 0xd5, 0x4d, 0x12, 0x21,
+ 0x6f, 0x33, 0x5f, 0x95, 0xb4, 0x6e, 0x91, 0x64, 0x07, 0xd0, 0x94, 0x62, 0x8a, 0x46, 0x8c, 0x82,
+ 0xd4, 0xf8, 0x12, 0xb3, 0xff, 0x01, 0x42, 0x15, 0xbd, 0x39, 0x73, 0xf5, 0x6a, 0xbd, 0xea, 0xa0,
+ 0x7d, 0xbc, 0x97, 0xd7, 0xbb, 0x58, 0x6a, 0x7e, 0xe1, 0x39, 0xf6, 0x02, 0xb6, 0x13, 0x61, 0x6e,
+ 0x30, 0xb9, 0xd0, 0x52, 0x24, 0x4a, 0x47, 0x74, 0x1f, 0xed, 0x63, 0x9e, 0xbf, 0x79, 0x5d, 0xd2,
+ 0xfd, 0x95, 0xe7, 0xfb, 0x1f, 0x3c, 0x80, 0xfc, 0xf0, 0x52, 0x8b, 0xde, 0x4a, 0x8b, 0x1c, 0x1a,
+ 0x93, 0x92, 0xbd, 0x0c, 0xae, 0xdb, 0xaf, 0x3e, 0x65, 0x7f, 0xbd, 0xd9, 0xda, 0x1f, 0x36, 0xfb,
+ 0xad, 0x06, 0xcd, 0xe1, 0x78, 0x86, 0x26, 0xd6, 0xd1, 0x4f, 0x33, 0x37, 0x2a, 0x67, 0x6e, 0xf4,
+ 0x9b, 0x99, 0x73, 0xa7, 0xbe, 0x52, 0xf2, 0xb5, 0x09, 0xa9, 0xb1, 0x96, 0x5f, 0xe2, 0x58, 0x17,
+ 0xc0, 0xe1, 0x4b, 0x31, 0x75, 0xb9, 0x6b, 0xf9, 0x05, 0x86, 0xed, 0x42, 0x55, 0xdc, 0x60, 0x9a,
+ 0x38, 0xfb, 0xd7, 0x32, 0x31, 0xbe, 0x4b, 0x53, 0x66, 0xff, 0xda, 0xdc, 0xaa, 0xe0, 0x54, 0x98,
+ 0x80, 0x37, 0x89, 0x4c, 0x91, 0xed, 0x7d, 0xa6, 0xe4, 0x10, 0x63, 0xc9, 0x5b, 0xae, 0xf7, 0x14,
+ 0xda, 0x81, 0xcc, 0x6e, 0x75, 0x84, 0x97, 0xf3, 0x29, 0x07, 0x37, 0x90, 0x0c, 0xdb, 0x8e, 0xa4,
+ 0x41, 0x91, 0xe0, 0xb5, 0x9a, 0x22, 0x6f, 0xbb, 0x8e, 0x72, 0xc6, 0xea, 0xf3, 0x59, 0x90, 0xe9,
+ 0x5b, 0x4e, 0xcf, 0x19, 0x1a, 0x36, 0x3d, 0x7d, 0xb2, 0xe0, 0x9d, 0x74, 0xd8, 0x29, 0xb6, 0x9a,
+ 0x8a, 0x87, 0x18, 0x62, 0x82, 0x7c, 0x9b, 0x76, 0x6c, 0x89, 0xed, 0x6d, 0x4d, 0x75, 0xa4, 0x12,
+ 0x6d, 0x2e, 0xf0, 0x0e, 0x43, 0xbe, 0xe3, 0x6e, 0xab, 0xc8, 0x15, 0x36, 0x74, 0xb7, 0xb4, 0xa1,
+ 0x07, 0xd0, 0x34, 0x18, 0xdb, 0x4d, 0x0c, 0xf8, 0x5f, 0xae, 0x66, 0x86, 0xf3, 0xbd, 0x64, 0x85,
+ 0xbd, 0x24, 0x97, 0xc2, 0xb8, 0x21, 0xc4, 0xfc, 0xef, 0xd4, 0xe5, 0x92, 0xb1, 0x77, 0x27, 0x85,
+ 0xb9, 0x5e, 0xcc, 0x90, 0xef, 0x51, 0xa9, 0x0c, 0xba, 0x30, 0x9b, 0x13, 0x23, 0xa2, 0x80, 0xff,
+ 0xe3, 0x3c, 0x64, 0x38, 0xd5, 0x4e, 0x75, 0xa8, 0x0d, 0xdf, 0x5f, 0x6a, 0x84, 0xfb, 0x1f, 0xab,
+ 0xd0, 0x18, 0x8e, 0x29, 0x3d, 0x6b, 0x29, 0x3b, 0x84, 0x16, 0x09, 0x14, 0x02, 0x97, 0xb3, 0x9c,
+ 0x58, 0xaa, 0x34, 0xc9, 0x6a, 0x41, 0xa5, 0x59, 0x66, 0x2a, 0xf5, 0x5a, 0x2b, 0xa8, 0xd4, 0xed,
+ 0x3e, 0xd4, 0xc7, 0x6f, 0x49, 0x72, 0xd9, 0x4a, 0x91, 0x7d, 0x2b, 0x4e, 0x84, 0x49, 0x68, 0x88,
+ 0x2e, 0x5d, 0x39, 0x61, 0xdd, 0x63, 0x14, 0x90, 0xe6, 0x72, 0x96, 0xc1, 0x95, 0x74, 0x34, 0x7f,
+ 0x91, 0x8e, 0xd6, 0xb3, 0xe9, 0x80, 0x67, 0xd2, 0xd1, 0x5e, 0x49, 0xc7, 0x21, 0xb4, 0x54, 0x7c,
+ 0xae, 0x0d, 0xde, 0xa1, 0x49, 0x43, 0x97, 0x13, 0x85, 0x5c, 0x74, 0x4a, 0xb9, 0xb0, 0x9b, 0x11,
+ 0x5f, 0x2d, 0x22, 0x49, 0x69, 0xb3, 0x9b, 0x41, 0x68, 0xfd, 0x8b, 0xbe, 0xf3, 0xc4, 0x17, 0xfd,
+ 0x84, 0x7f, 0x7a, 0xe8, 0x7a, 0xf7, 0x0f, 0x5d, 0xef, 0xeb, 0x43, 0xd7, 0x7b, 0xff, 0xd8, 0xdd,
+ 0xb8, 0x7f, 0xec, 0x6e, 0x7c, 0x79, 0xec, 0x6e, 0x8c, 0xeb, 0xf4, 0x6d, 0xf9, 0xef, 0x47, 0x00,
+ 0x00, 0x00, 0xff, 0xff, 0x61, 0x99, 0xc4, 0x66, 0xd0, 0x06, 0x00, 0x00,
}
func (m *Esinfo) Marshal() (dAtA []byte, err error) {
@@ -741,59 +698,6 @@
}
func (m *Esinfo) MarshalTo(dAtA []byte) (int, error) {
- var i int
- _ = i
- var l int
- _ = l
- if len(m.Id) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.Id)))
- i += copy(dAtA[i:], m.Id)
- }
- if len(m.Tableid) > 0 {
- dAtA[i] = 0x12
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.Tableid)))
- i += copy(dAtA[i:], m.Tableid)
- }
- if len(m.FaceFeature) > 0 {
- dAtA[i] = 0x1a
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.FaceFeature)))
- i += copy(dAtA[i:], m.FaceFeature)
- }
- if m.CompareScore != 0 {
- dAtA[i] = 0x25
- i++
- encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.CompareScore))))
- i += 4
- }
- if m.Enable != 0 {
- dAtA[i] = 0x28
- i++
- i = encodeVarintEs(dAtA, i, uint64(m.Enable))
- }
- if len(m.AnalyServerId) > 0 {
- dAtA[i] = 0x32
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.AnalyServerId)))
- i += copy(dAtA[i:], m.AnalyServerId)
- }
- return i, nil
-}
-
-func (m *PersonCar) Marshal() (dAtA []byte, err error) {
- size := m.Size()
- dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
- if err != nil {
- return nil, err
- }
- return dAtA[:n], nil
-}
-
-func (m *PersonCar) MarshalTo(dAtA []byte) (int, error) {
var i int
_ = i
var l int
@@ -1069,6 +973,43 @@
i = encodeVarintEs(dAtA, i, uint64(len(m.Reserved)))
i += copy(dAtA[i:], m.Reserved)
}
+ if len(m.CarNo) > 0 {
+ dAtA[i] = 0x92
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(len(m.CarNo)))
+ i += copy(dAtA[i:], m.CarNo)
+ }
+ if len(m.CarPicUrls) > 0 {
+ dAtA[i] = 0x9a
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(len(m.CarPicUrls)))
+ i += copy(dAtA[i:], m.CarPicUrls)
+ }
+ if m.CarType != 0 {
+ dAtA[i] = 0xa0
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(m.CarType))
+ }
+ if m.CarBrand != 0 {
+ dAtA[i] = 0xa8
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(m.CarBrand))
+ }
+ if m.CarColor != 0 {
+ dAtA[i] = 0xb0
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(m.CarColor))
+ }
return i, nil
}
@@ -1188,37 +1129,6 @@
return offset + 1
}
func (m *Esinfo) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- l = len(m.Id)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.Tableid)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.FaceFeature)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- if m.CompareScore != 0 {
- n += 5
- }
- if m.Enable != 0 {
- n += 1 + sovEs(uint64(m.Enable))
- }
- l = len(m.AnalyServerId)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- return n
-}
-
-func (m *PersonCar) Size() (n int) {
if m == nil {
return 0
}
@@ -1381,6 +1291,23 @@
if l > 0 {
n += 2 + l + sovEs(uint64(l))
}
+ l = len(m.CarNo)
+ if l > 0 {
+ n += 2 + l + sovEs(uint64(l))
+ }
+ l = len(m.CarPicUrls)
+ if l > 0 {
+ n += 2 + l + sovEs(uint64(l))
+ }
+ if m.CarType != 0 {
+ n += 2 + sovEs(uint64(m.CarType))
+ }
+ if m.CarBrand != 0 {
+ n += 2 + sovEs(uint64(m.CarBrand))
+ }
+ if m.CarColor != 0 {
+ n += 2 + sovEs(uint64(m.CarColor))
+ }
return n
}
@@ -1484,217 +1411,6 @@
}
if fieldNum <= 0 {
return fmt.Errorf("proto: Esinfo: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowEs
- }
- 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 ErrInvalidLengthEs
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthEs
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Id = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 2:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Tableid", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowEs
- }
- 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 ErrInvalidLengthEs
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthEs
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Tableid = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 3:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field FaceFeature", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowEs
- }
- 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 ErrInvalidLengthEs
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthEs
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.FaceFeature = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 4:
- 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 5:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Enable", wireType)
- }
- m.Enable = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowEs
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.Enable |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- case 6:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field AnalyServerId", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowEs
- }
- 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 ErrInvalidLengthEs
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthEs
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.AnalyServerId = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- default:
- iNdEx = preIndex
- skippy, err := skipEs(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if skippy < 0 {
- return ErrInvalidLengthEs
- }
- if (iNdEx + skippy) < 0 {
- return ErrInvalidLengthEs
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func (m *PersonCar) Unmarshal(dAtA []byte) error {
- l := len(dAtA)
- iNdEx := 0
- for iNdEx < l {
- preIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowEs
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- wireType := int(wire & 0x7)
- if wireType == 4 {
- return fmt.Errorf("proto: PersonCar: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: PersonCar: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
@@ -2866,6 +2582,127 @@
}
m.Reserved = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
+ case 18:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarNo", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ 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 ErrInvalidLengthEs
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthEs
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.CarNo = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 19:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarPicUrls", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ 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 ErrInvalidLengthEs
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthEs
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.CarPicUrls = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 20:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarType", wireType)
+ }
+ m.CarType = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.CarType |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ case 21:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarBrand", wireType)
+ }
+ m.CarBrand = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.CarBrand |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ case 22:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarColor", wireType)
+ }
+ m.CarColor = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.CarColor |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipEs(dAtA[iNdEx:])
--
Gitblit v1.8.0