From a9a6b404a78e70660dec8398644d8a94cef97704 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 26 七月 2019 19:02:45 +0800
Subject: [PATCH] --
---
videoperson.proto | 4
videoperson.pb.go | 224 ++++++++++++++++++++++++++++---------------------------
2 files changed, 116 insertions(+), 112 deletions(-)
diff --git a/videoperson.pb.go b/videoperson.pb.go
index 63f5088..0abdd35 100644
--- a/videoperson.pb.go
+++ b/videoperson.pb.go
@@ -24,35 +24,35 @@
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type Videopersons struct {
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
- CameraId string `protobuf:"bytes,2,opt,name=cameraId,proto3" json:"cameraId,omitempty"`
- CameraAddr string `protobuf:"bytes,3,opt,name=cameraAddr,proto3" json:"cameraAddr,omitempty"`
- PicDate string `protobuf:"bytes,4,opt,name=picDate,proto3" json:"picDate,omitempty"`
- PicMaxUrl string `protobuf:"bytes,5,opt,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"`
- TaskId string `protobuf:"bytes,6,opt,name=taskId,proto3" json:"taskId,omitempty"`
- TaskName string `protobuf:"bytes,7,opt,name=taskName,proto3" json:"taskName,omitempty"`
- SdkName string `protobuf:"bytes,8,opt,name=sdkName,proto3" json:"sdkName,omitempty"`
- Content string `protobuf:"bytes,9,opt,name=content,proto3" json:"content,omitempty"`
- LikeDate string `protobuf:"bytes,10,opt,name=likeDate,proto3" json:"likeDate,omitempty"`
- DetectScore string `protobuf:"bytes,11,opt,name=detectScore,proto3" json:"detectScore,omitempty"`
- Sex string `protobuf:"bytes,12,opt,name=sex,proto3" json:"sex,omitempty"`
- Age int32 `protobuf:"varint,13,opt,name=age,proto3" json:"age,omitempty"`
- AgeDescription string `protobuf:"bytes,14,opt,name=ageDescription,proto3" json:"ageDescription,omitempty"`
- Race string `protobuf:"bytes,15,opt,name=race,proto3" json:"race,omitempty"`
- SmileLevel string `protobuf:"bytes,16,opt,name=smileLevel,proto3" json:"smileLevel,omitempty"`
- BeautyLevel string `protobuf:"bytes,17,opt,name=beautyLevel,proto3" json:"beautyLevel,omitempty"`
- PicSmUrl string `protobuf:"bytes,18,opt,name=picSmUrl,proto3" json:"picSmUrl,omitempty"`
- VideoUrl string `protobuf:"bytes,19,opt,name=videoUrl,proto3" json:"videoUrl,omitempty"`
- AnalyServerId string `protobuf:"bytes,20,opt,name=analyServerId,proto3" json:"analyServerId,omitempty"`
- AnalyServerName string `protobuf:"bytes,21,opt,name=analyServerName,proto3" json:"analyServerName,omitempty"`
- AnalyServerIp string `protobuf:"bytes,22,opt,name=analyServerIp,proto3" json:"analyServerIp,omitempty"`
- ClusterId string `protobuf:"bytes,23,opt,name=clusterId,proto3" json:"clusterId,omitempty"`
- IsAlarm string `protobuf:"bytes,24,opt,name=isAlarm,proto3" json:"isAlarm,omitempty"`
- IsAckAlarm string `protobuf:"bytes,25,opt,name=isAckAlarm,proto3" json:"isAckAlarm,omitempty"`
- IsCollect int32 `protobuf:"varint,26,opt,name=isCollect,proto3" json:"isCollect,omitempty"`
- IsDelete int32 `protobuf:"varint,27,opt,name=isDelete,proto3" json:"isDelete,omitempty"`
- AlarmRules *AlarmRules `protobuf:"bytes,28,opt,name=alarmRules,proto3" json:"alarmRules,omitempty"`
- BaseInfo *BaseInfo `protobuf:"bytes,29,opt,name=baseInfo,proto3" json:"baseInfo,omitempty"`
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+ CameraId string `protobuf:"bytes,2,opt,name=cameraId,proto3" json:"cameraId,omitempty"`
+ CameraAddr string `protobuf:"bytes,3,opt,name=cameraAddr,proto3" json:"cameraAddr,omitempty"`
+ PicDate string `protobuf:"bytes,4,opt,name=picDate,proto3" json:"picDate,omitempty"`
+ PicMaxUrl string `protobuf:"bytes,5,opt,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"`
+ TaskId string `protobuf:"bytes,6,opt,name=taskId,proto3" json:"taskId,omitempty"`
+ TaskName string `protobuf:"bytes,7,opt,name=taskName,proto3" json:"taskName,omitempty"`
+ SdkName string `protobuf:"bytes,8,opt,name=sdkName,proto3" json:"sdkName,omitempty"`
+ Content string `protobuf:"bytes,9,opt,name=content,proto3" json:"content,omitempty"`
+ LikeDate string `protobuf:"bytes,10,opt,name=likeDate,proto3" json:"likeDate,omitempty"`
+ DetectScore string `protobuf:"bytes,11,opt,name=detectScore,proto3" json:"detectScore,omitempty"`
+ Sex string `protobuf:"bytes,12,opt,name=sex,proto3" json:"sex,omitempty"`
+ Age int32 `protobuf:"varint,13,opt,name=age,proto3" json:"age,omitempty"`
+ AgeDescription string `protobuf:"bytes,14,opt,name=ageDescription,proto3" json:"ageDescription,omitempty"`
+ Race string `protobuf:"bytes,15,opt,name=race,proto3" json:"race,omitempty"`
+ SmileLevel string `protobuf:"bytes,16,opt,name=smileLevel,proto3" json:"smileLevel,omitempty"`
+ BeautyLevel string `protobuf:"bytes,17,opt,name=beautyLevel,proto3" json:"beautyLevel,omitempty"`
+ PicSmUrl string `protobuf:"bytes,18,opt,name=picSmUrl,proto3" json:"picSmUrl,omitempty"`
+ VideoUrl string `protobuf:"bytes,19,opt,name=videoUrl,proto3" json:"videoUrl,omitempty"`
+ AnalyServerId string `protobuf:"bytes,20,opt,name=analyServerId,proto3" json:"analyServerId,omitempty"`
+ AnalyServerName string `protobuf:"bytes,21,opt,name=analyServerName,proto3" json:"analyServerName,omitempty"`
+ AnalyServerIp string `protobuf:"bytes,22,opt,name=analyServerIp,proto3" json:"analyServerIp,omitempty"`
+ ClusterId string `protobuf:"bytes,23,opt,name=clusterId,proto3" json:"clusterId,omitempty"`
+ IsAlarm string `protobuf:"bytes,24,opt,name=isAlarm,proto3" json:"isAlarm,omitempty"`
+ IsAckAlarm string `protobuf:"bytes,25,opt,name=isAckAlarm,proto3" json:"isAckAlarm,omitempty"`
+ IsCollect int32 `protobuf:"varint,26,opt,name=isCollect,proto3" json:"isCollect,omitempty"`
+ IsDelete int32 `protobuf:"varint,27,opt,name=isDelete,proto3" json:"isDelete,omitempty"`
+ AlarmRules []*AlarmRules `protobuf:"bytes,28,rep,name=alarmRules,proto3" json:"alarmRules,omitempty"`
+ BaseInfo []*BaseInfo `protobuf:"bytes,29,rep,name=baseInfo,proto3" json:"baseInfo,omitempty"`
}
func (m *Videopersons) Reset() { *m = Videopersons{} }
@@ -277,14 +277,14 @@
return 0
}
-func (m *Videopersons) GetAlarmRules() *AlarmRules {
+func (m *Videopersons) GetAlarmRules() []*AlarmRules {
if m != nil {
return m.AlarmRules
}
return nil
}
-func (m *Videopersons) GetBaseInfo() *BaseInfo {
+func (m *Videopersons) GetBaseInfo() []*BaseInfo {
if m != nil {
return m.BaseInfo
}
@@ -500,51 +500,51 @@
func init() { proto.RegisterFile("videoperson.proto", fileDescriptor_149f81aa0f752265) }
var fileDescriptor_149f81aa0f752265 = []byte{
- // 690 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x54, 0xbb, 0x6e, 0x1b, 0x3b,
- 0x10, 0xf5, 0xca, 0xb6, 0x2c, 0x53, 0x7e, 0xf2, 0xfa, 0xea, 0xf2, 0x3a, 0x8e, 0x20, 0x08, 0x41,
- 0xa0, 0x4a, 0x45, 0x92, 0x1f, 0x90, 0xed, 0x46, 0x40, 0x62, 0x04, 0x2b, 0x27, 0x3d, 0xc5, 0x1d,
- 0x2b, 0x84, 0xf7, 0x05, 0x92, 0x72, 0xec, 0x2e, 0x55, 0xea, 0x7c, 0x56, 0x4a, 0x97, 0x29, 0x03,
- 0xf9, 0x47, 0x82, 0x19, 0xee, 0x4b, 0x4e, 0xb5, 0x73, 0xce, 0xe1, 0x0e, 0x67, 0x86, 0x33, 0xc3,
- 0x8e, 0xef, 0x74, 0x04, 0x59, 0x0e, 0xc6, 0x66, 0xe9, 0x38, 0x37, 0x99, 0xcb, 0x78, 0x87, 0x3e,
- 0x89, 0x5d, 0x0c, 0xbf, 0xed, 0xb0, 0xbd, 0xcf, 0xb5, 0x6e, 0xf9, 0x01, 0x6b, 0xe9, 0x48, 0x04,
- 0x83, 0x60, 0xb4, 0x1b, 0xb6, 0x74, 0xc4, 0x4f, 0x59, 0x47, 0xc9, 0x04, 0x8c, 0x9c, 0x46, 0xa2,
- 0x45, 0x6c, 0x85, 0x79, 0x9f, 0x31, 0x6f, 0x4f, 0xa2, 0xc8, 0x88, 0x4d, 0x52, 0x1b, 0x0c, 0x17,
- 0x6c, 0x27, 0xd7, 0xea, 0x52, 0x3a, 0x10, 0x5b, 0x24, 0x96, 0x90, 0x9f, 0xb1, 0xdd, 0x5c, 0xab,
- 0x0f, 0xf2, 0xfe, 0x93, 0x89, 0xc5, 0x36, 0x69, 0x35, 0xc1, 0x7b, 0xac, 0xed, 0xa4, 0xbd, 0x9d,
- 0x46, 0xa2, 0x4d, 0x52, 0x81, 0x30, 0x16, 0xb4, 0xae, 0x64, 0x02, 0x62, 0xc7, 0xc7, 0x52, 0x62,
- 0xbc, 0xcb, 0x46, 0x5e, 0xea, 0xf8, 0xbb, 0x0a, 0x88, 0x8a, 0xca, 0x52, 0x07, 0xa9, 0x13, 0xbb,
- 0x5e, 0x29, 0x20, 0xfa, 0x8b, 0xf5, 0x2d, 0x50, 0x80, 0xcc, 0xfb, 0x2b, 0x31, 0x1f, 0xb0, 0x6e,
- 0x04, 0x0e, 0x94, 0x9b, 0xa9, 0xcc, 0x80, 0xe8, 0x92, 0xdc, 0xa4, 0xf8, 0x11, 0xdb, 0xb4, 0x70,
- 0x2f, 0xf6, 0x48, 0x41, 0x13, 0x19, 0xb9, 0x00, 0xb1, 0x3f, 0x08, 0x46, 0xdb, 0x21, 0x9a, 0xfc,
- 0x35, 0x3b, 0x90, 0x0b, 0xb8, 0x04, 0xab, 0x8c, 0xce, 0x9d, 0xce, 0x52, 0x71, 0x40, 0xc7, 0x9f,
- 0xb1, 0x9c, 0xb3, 0x2d, 0x23, 0x15, 0x88, 0x43, 0x52, 0xc9, 0xc6, 0xea, 0xda, 0x44, 0xc7, 0xf0,
- 0x1e, 0xee, 0x20, 0x16, 0x47, 0xbe, 0xba, 0x35, 0x83, 0x11, 0xce, 0x41, 0x2e, 0xdd, 0x83, 0x3f,
- 0x70, 0xec, 0x23, 0x6c, 0x50, 0x98, 0x5f, 0xae, 0xd5, 0x2c, 0xc1, 0x22, 0x73, 0x9f, 0x5f, 0x89,
- 0x51, 0xa3, 0xbe, 0x40, 0xed, 0x1f, 0xaf, 0x95, 0x98, 0xbf, 0x62, 0xfb, 0x32, 0x95, 0xf1, 0xc3,
- 0x0c, 0xcc, 0x1d, 0x98, 0x69, 0x24, 0x4e, 0xe8, 0xc0, 0x3a, 0xc9, 0x47, 0xec, 0xb0, 0x41, 0x50,
- 0xe5, 0xff, 0xa5, 0x73, 0xcf, 0xe9, 0xe7, 0xfe, 0x72, 0xd1, 0xfb, 0xdb, 0x5f, 0x8e, 0x3d, 0xa1,
- 0xe2, 0xa5, 0x75, 0x74, 0xe3, 0x7f, 0xbe, 0x27, 0x2a, 0x02, 0x5f, 0x51, 0xdb, 0x49, 0x2c, 0x4d,
- 0x22, 0x84, 0x7f, 0xc5, 0x02, 0x62, 0x9d, 0xb4, 0x9d, 0xa8, 0x5b, 0x2f, 0xfe, 0xef, 0xeb, 0x54,
- 0x33, 0xe8, 0x57, 0xdb, 0x8b, 0x2c, 0x8e, 0x41, 0x39, 0x71, 0x4a, 0x6f, 0x53, 0x13, 0x58, 0x07,
- 0x6d, 0x2f, 0x21, 0x06, 0x07, 0xe2, 0x05, 0x89, 0x15, 0xe6, 0xef, 0x18, 0x93, 0xe8, 0x22, 0x5c,
- 0xc6, 0x60, 0xc5, 0xd9, 0x20, 0x18, 0x75, 0xdf, 0x9c, 0x8c, 0xcb, 0xd9, 0x19, 0x4f, 0x2a, 0x2d,
- 0x6c, 0x9c, 0xe3, 0x63, 0xd6, 0x99, 0x4b, 0x0b, 0xd3, 0xf4, 0x26, 0x13, 0x2f, 0xe9, 0x1f, 0x5e,
- 0xff, 0x73, 0x5e, 0x28, 0x61, 0x75, 0x66, 0xf8, 0x3d, 0x60, 0xac, 0x76, 0x85, 0x89, 0x2e, 0x4c,
- 0xb6, 0xcc, 0xa7, 0xe5, 0x14, 0x96, 0x10, 0x13, 0xa5, 0x6b, 0xfc, 0x7b, 0xfb, 0x61, 0x6c, 0x30,
- 0x98, 0x8a, 0x59, 0xc6, 0x70, 0x0d, 0xf7, 0xae, 0x18, 0xc6, 0x0a, 0xf3, 0x21, 0xdb, 0x8b, 0xe0,
- 0x06, 0x52, 0x05, 0x33, 0x57, 0xce, 0x63, 0x27, 0x5c, 0xe3, 0x86, 0xab, 0x16, 0xeb, 0x94, 0xf1,
- 0x61, 0x18, 0x4e, 0xce, 0x63, 0xa8, 0xc3, 0x28, 0x20, 0xd6, 0x93, 0x4c, 0x7a, 0x71, 0x1f, 0x45,
- 0x4d, 0xe0, 0x45, 0x2a, 0x4b, 0x72, 0x69, 0xc0, 0x0f, 0x0e, 0x06, 0xd2, 0x0a, 0xd7, 0x38, 0xea,
- 0x4b, 0x5a, 0x37, 0xd3, 0xa8, 0x58, 0x0c, 0x15, 0xc6, 0x24, 0xbd, 0x4d, 0xee, 0xfd, 0x6a, 0x68,
- 0x30, 0xe8, 0xdf, 0xa3, 0x8f, 0x5a, 0x61, 0xef, 0xfa, 0x0d, 0xb1, 0xc6, 0x91, 0xff, 0x2f, 0x59,
- 0x0a, 0x57, 0xcb, 0xa4, 0xdc, 0x13, 0x25, 0x2e, 0xa7, 0xb6, 0x53, 0x4f, 0x6d, 0x8f, 0xb5, 0x75,
- 0x74, 0x21, 0x4d, 0x54, 0xac, 0x87, 0x02, 0xe1, 0x4d, 0x49, 0x96, 0x6a, 0x97, 0x19, 0x5f, 0x70,
- 0xbf, 0x21, 0xd6, 0xb8, 0xe6, 0x6e, 0xe9, 0xae, 0xef, 0x96, 0x1e, 0x6b, 0xcf, 0xbf, 0x5e, 0x3f,
- 0xe4, 0x40, 0x0b, 0x62, 0x3b, 0x2c, 0xd0, 0xb9, 0xf8, 0xb9, 0xea, 0x07, 0x8f, 0xab, 0x7e, 0xf0,
- 0x7b, 0xd5, 0x0f, 0x7e, 0x3c, 0xf5, 0x37, 0x1e, 0x9f, 0xfa, 0x1b, 0xbf, 0x9e, 0xfa, 0x1b, 0xf3,
- 0x36, 0x35, 0xc9, 0xdb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xfb, 0xd8, 0xcc, 0xb0, 0x05,
- 0x00, 0x00,
+ // 692 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x54, 0x4f, 0x4f, 0x1b, 0x3b,
+ 0x10, 0x27, 0x01, 0x42, 0x70, 0xf8, 0xeb, 0xc7, 0xcb, 0xf3, 0xa3, 0x34, 0x8a, 0xa2, 0xaa, 0xca,
+ 0x29, 0x87, 0xb6, 0x5f, 0x20, 0xc0, 0x25, 0x52, 0x8b, 0xaa, 0x0d, 0xed, 0xdd, 0xf1, 0x0e, 0xa9,
+ 0xc5, 0xee, 0x7a, 0x65, 0x3b, 0x14, 0x6e, 0x3d, 0xf5, 0xdc, 0x8f, 0xd5, 0x23, 0xc7, 0x1e, 0xab,
+ 0xf0, 0x45, 0xaa, 0x19, 0xef, 0x66, 0x37, 0xf4, 0xb4, 0xf3, 0xfb, 0xfd, 0xbc, 0xe3, 0x99, 0xf1,
+ 0xcc, 0xb0, 0xe3, 0x3b, 0x1d, 0x83, 0xc9, 0xc1, 0x3a, 0x93, 0x8d, 0x72, 0x6b, 0xbc, 0xe1, 0x6d,
+ 0xfa, 0xa4, 0x6e, 0x3e, 0xf8, 0xb6, 0xc3, 0xf6, 0x3e, 0x57, 0xba, 0xe3, 0x07, 0xac, 0xa9, 0x63,
+ 0xd1, 0xe8, 0x37, 0x86, 0xbb, 0x51, 0x53, 0xc7, 0xfc, 0x94, 0xb5, 0x95, 0x4c, 0xc1, 0xca, 0x49,
+ 0x2c, 0x9a, 0xc4, 0xae, 0x30, 0xef, 0x31, 0x16, 0xec, 0x71, 0x1c, 0x5b, 0xb1, 0x49, 0x6a, 0x8d,
+ 0xe1, 0x82, 0xed, 0xe4, 0x5a, 0x5d, 0x4a, 0x0f, 0x62, 0x8b, 0xc4, 0x12, 0xf2, 0x33, 0xb6, 0x9b,
+ 0x6b, 0xf5, 0x41, 0xde, 0x7f, 0xb2, 0x89, 0xd8, 0x26, 0xad, 0x22, 0x78, 0x97, 0xb5, 0xbc, 0x74,
+ 0xb7, 0x93, 0x58, 0xb4, 0x48, 0x2a, 0x10, 0xc6, 0x82, 0xd6, 0x95, 0x4c, 0x41, 0xec, 0x84, 0x58,
+ 0x4a, 0x8c, 0x77, 0xb9, 0x38, 0x48, 0xed, 0x70, 0x57, 0x01, 0x51, 0x51, 0x26, 0xf3, 0x90, 0x79,
+ 0xb1, 0x1b, 0x94, 0x02, 0xa2, 0xbf, 0x44, 0xdf, 0x02, 0x05, 0xc8, 0x82, 0xbf, 0x12, 0xf3, 0x3e,
+ 0xeb, 0xc4, 0xe0, 0x41, 0xf9, 0xa9, 0x32, 0x16, 0x44, 0x87, 0xe4, 0x3a, 0xc5, 0x8f, 0xd8, 0xa6,
+ 0x83, 0x7b, 0xb1, 0x47, 0x0a, 0x9a, 0xc8, 0xc8, 0x39, 0x88, 0xfd, 0x7e, 0x63, 0xb8, 0x1d, 0xa1,
+ 0xc9, 0x5f, 0xb3, 0x03, 0x39, 0x87, 0x4b, 0x70, 0xca, 0xea, 0xdc, 0x6b, 0x93, 0x89, 0x03, 0x3a,
+ 0xfe, 0x8c, 0xe5, 0x9c, 0x6d, 0x59, 0xa9, 0x40, 0x1c, 0x92, 0x4a, 0x36, 0x56, 0xd7, 0xa5, 0x3a,
+ 0x81, 0xf7, 0x70, 0x07, 0x89, 0x38, 0x0a, 0xd5, 0xad, 0x18, 0x8c, 0x70, 0x06, 0x72, 0xe1, 0x1f,
+ 0xc2, 0x81, 0xe3, 0x10, 0x61, 0x8d, 0xc2, 0xfc, 0x72, 0xad, 0xa6, 0x29, 0x16, 0x99, 0x87, 0xfc,
+ 0x4a, 0x8c, 0x1a, 0xf5, 0x05, 0x6a, 0xff, 0x04, 0xad, 0xc4, 0xfc, 0x15, 0xdb, 0x97, 0x99, 0x4c,
+ 0x1e, 0xa6, 0x60, 0xef, 0xc0, 0x4e, 0x62, 0x71, 0x42, 0x07, 0xd6, 0x49, 0x3e, 0x64, 0x87, 0x35,
+ 0x82, 0x2a, 0xff, 0x2f, 0x9d, 0x7b, 0x4e, 0x3f, 0xf7, 0x97, 0x8b, 0xee, 0xdf, 0xfe, 0x72, 0xec,
+ 0x09, 0x95, 0x2c, 0x9c, 0xa7, 0x1b, 0xff, 0x0b, 0x3d, 0xb1, 0x22, 0xf0, 0x15, 0xb5, 0x1b, 0x27,
+ 0xd2, 0xa6, 0x42, 0x84, 0x57, 0x2c, 0x20, 0xd6, 0x49, 0xbb, 0xb1, 0xba, 0x0d, 0xe2, 0xff, 0xa1,
+ 0x4e, 0x15, 0x83, 0x7e, 0xb5, 0xbb, 0x30, 0x49, 0x02, 0xca, 0x8b, 0x53, 0x7a, 0x9b, 0x8a, 0xc0,
+ 0x3a, 0x68, 0x77, 0x09, 0x09, 0x78, 0x10, 0x2f, 0x48, 0x5c, 0x61, 0xfe, 0x8e, 0x31, 0x89, 0x2e,
+ 0xa2, 0x45, 0x02, 0x4e, 0x9c, 0xf5, 0x37, 0x87, 0x9d, 0x37, 0x27, 0xa3, 0x72, 0x76, 0x46, 0xe3,
+ 0x95, 0x16, 0xd5, 0xce, 0xf1, 0x11, 0x6b, 0xcf, 0xa4, 0x83, 0x49, 0x76, 0x63, 0xc4, 0x4b, 0xfa,
+ 0x87, 0x57, 0xff, 0x9c, 0x17, 0x4a, 0xb4, 0x3a, 0x33, 0xf8, 0xde, 0x60, 0xac, 0x72, 0x85, 0x89,
+ 0xce, 0xad, 0x59, 0xe4, 0x93, 0x72, 0x0a, 0x4b, 0x88, 0x89, 0xd2, 0x35, 0xe1, 0xbd, 0xc3, 0x30,
+ 0xd6, 0x18, 0x4c, 0xc5, 0x2e, 0x12, 0xb8, 0x86, 0x7b, 0x5f, 0x0c, 0xe3, 0x0a, 0xf3, 0x01, 0xdb,
+ 0x8b, 0xe1, 0x06, 0x32, 0x05, 0x53, 0x5f, 0xce, 0x63, 0x3b, 0x5a, 0xe3, 0x06, 0xcb, 0x26, 0x6b,
+ 0x97, 0xf1, 0x61, 0x18, 0x5e, 0xce, 0x12, 0xa8, 0xc2, 0x28, 0x20, 0xd6, 0x93, 0x4c, 0x7a, 0xf1,
+ 0x10, 0x45, 0x45, 0xe0, 0x45, 0xca, 0xa4, 0xb9, 0xb4, 0x10, 0x06, 0x07, 0x03, 0x69, 0x46, 0x6b,
+ 0x1c, 0xf5, 0x25, 0xad, 0x9b, 0x49, 0x5c, 0x2c, 0x86, 0x15, 0xc6, 0x24, 0x83, 0x4d, 0xee, 0xc3,
+ 0x6a, 0xa8, 0x31, 0xe8, 0x3f, 0xa0, 0x8f, 0x5a, 0x61, 0xef, 0x86, 0x0d, 0xb1, 0xc6, 0x91, 0xff,
+ 0x2f, 0x26, 0x83, 0xab, 0x45, 0x5a, 0xee, 0x89, 0x12, 0x97, 0x53, 0xdb, 0xae, 0xa6, 0xb6, 0xcb,
+ 0x5a, 0x3a, 0xbe, 0x90, 0x36, 0x2e, 0xd6, 0x43, 0x81, 0xf0, 0xa6, 0xd4, 0x64, 0xda, 0x1b, 0x1b,
+ 0x0a, 0x1e, 0x36, 0xc4, 0x1a, 0x57, 0xdf, 0x2d, 0x9d, 0xf5, 0xdd, 0xd2, 0x65, 0xad, 0xd9, 0xd7,
+ 0xeb, 0x87, 0x1c, 0x68, 0x41, 0x6c, 0x47, 0x05, 0x3a, 0x17, 0x3f, 0x97, 0xbd, 0xc6, 0xe3, 0xb2,
+ 0xd7, 0xf8, 0xbd, 0xec, 0x35, 0x7e, 0x3c, 0xf5, 0x36, 0x1e, 0x9f, 0x7a, 0x1b, 0xbf, 0x9e, 0x7a,
+ 0x1b, 0xb3, 0x16, 0x35, 0xc9, 0xdb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x93, 0x65, 0x3e,
+ 0xb0, 0x05, 0x00, 0x00,
}
func (m *Videopersons) Marshal() (dAtA []byte, err error) {
@@ -745,29 +745,33 @@
i++
i = encodeVarintVideoperson(dAtA, i, uint64(m.IsDelete))
}
- if m.AlarmRules != nil {
- dAtA[i] = 0xe2
- i++
- dAtA[i] = 0x1
- i++
- i = encodeVarintVideoperson(dAtA, i, uint64(m.AlarmRules.Size()))
- n1, err1 := m.AlarmRules.MarshalTo(dAtA[i:])
- if err1 != nil {
- return 0, err1
+ if len(m.AlarmRules) > 0 {
+ for _, msg := range m.AlarmRules {
+ dAtA[i] = 0xe2
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintVideoperson(dAtA, i, uint64(msg.Size()))
+ n, err := msg.MarshalTo(dAtA[i:])
+ if err != nil {
+ return 0, err
+ }
+ i += n
}
- i += n1
}
- if m.BaseInfo != nil {
- dAtA[i] = 0xea
- i++
- dAtA[i] = 0x1
- i++
- i = encodeVarintVideoperson(dAtA, i, uint64(m.BaseInfo.Size()))
- n2, err2 := m.BaseInfo.MarshalTo(dAtA[i:])
- if err2 != nil {
- return 0, err2
+ if len(m.BaseInfo) > 0 {
+ for _, msg := range m.BaseInfo {
+ dAtA[i] = 0xea
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintVideoperson(dAtA, i, uint64(msg.Size()))
+ n, err := msg.MarshalTo(dAtA[i:])
+ if err != nil {
+ return 0, err
+ }
+ i += n
}
- i += n2
}
return i, nil
}
@@ -1027,13 +1031,17 @@
if m.IsDelete != 0 {
n += 2 + sovVideoperson(uint64(m.IsDelete))
}
- if m.AlarmRules != nil {
- l = m.AlarmRules.Size()
- n += 2 + l + sovVideoperson(uint64(l))
+ if len(m.AlarmRules) > 0 {
+ for _, e := range m.AlarmRules {
+ l = e.Size()
+ n += 2 + l + sovVideoperson(uint64(l))
+ }
}
- if m.BaseInfo != nil {
- l = m.BaseInfo.Size()
- n += 2 + l + sovVideoperson(uint64(l))
+ if len(m.BaseInfo) > 0 {
+ for _, e := range m.BaseInfo {
+ l = e.Size()
+ n += 2 + l + sovVideoperson(uint64(l))
+ }
}
return n
}
@@ -2006,10 +2014,8 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- if m.AlarmRules == nil {
- m.AlarmRules = &AlarmRules{}
- }
- if err := m.AlarmRules.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ m.AlarmRules = append(m.AlarmRules, &AlarmRules{})
+ if err := m.AlarmRules[len(m.AlarmRules)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -2042,10 +2048,8 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- if m.BaseInfo == nil {
- m.BaseInfo = &BaseInfo{}
- }
- if err := m.BaseInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ m.BaseInfo = append(m.BaseInfo, &BaseInfo{})
+ if err := m.BaseInfo[len(m.BaseInfo)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
diff --git a/videoperson.proto b/videoperson.proto
index 4bc2c15..f6f93a2 100644
--- a/videoperson.proto
+++ b/videoperson.proto
@@ -30,8 +30,8 @@
string isAckAlarm =25;
int32 isCollect =26;
int32 isDelete =27;
- AlarmRules alarmRules =28;
- BaseInfo baseInfo =29;
+ repeated AlarmRules alarmRules =28;
+ repeated BaseInfo baseInfo =29;
}
message AlarmRules {
--
Gitblit v1.8.0