From edd40582998e768d7942a4189887b2c66a9e13df Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 31 十月 2019 09:31:01 +0800
Subject: [PATCH] AlarmRules add isLink and linkInfo
---
videoperson.pb.go | 182 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 137 insertions(+), 45 deletions(-)
diff --git a/videoperson.pb.go b/videoperson.pb.go
index 52d3454..0c632ee 100644
--- a/videoperson.pb.go
+++ b/videoperson.pb.go
@@ -296,6 +296,8 @@
AlarmLevel string `protobuf:"bytes,2,opt,name=alarmLevel,proto3" json:"alarmLevel,omitempty"`
RuleText string `protobuf:"bytes,3,opt,name=ruleText,proto3" json:"ruleText,omitempty"`
DefenceState bool `protobuf:"varint,4,opt,name=defenceState,proto3" json:"defenceState,omitempty"`
+ IsLink bool `protobuf:"varint,5,opt,name=isLink,proto3" json:"isLink,omitempty"`
+ LinkInfo string `protobuf:"bytes,6,opt,name=linkInfo,proto3" json:"linkInfo,omitempty"`
}
func (m *AlarmRules) Reset() { *m = AlarmRules{} }
@@ -357,6 +359,20 @@
return m.DefenceState
}
return false
+}
+
+func (m *AlarmRules) GetIsLink() bool {
+ if m != nil {
+ return m.IsLink
+ }
+ return false
+}
+
+func (m *AlarmRules) GetLinkInfo() string {
+ if m != nil {
+ return m.LinkInfo
+ }
+ return ""
}
type BaseInfo struct {
@@ -500,51 +516,52 @@
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, 0xcd, 0x6e, 0x13, 0x31,
- 0x10, 0x6e, 0x92, 0x36, 0x4d, 0x9d, 0xfe, 0x9a, 0x12, 0x4c, 0x29, 0x51, 0x14, 0x21, 0x94, 0x53,
- 0x0e, 0xc0, 0x0b, 0xa4, 0xed, 0x25, 0x12, 0x54, 0x68, 0x53, 0xb8, 0x3b, 0xde, 0x69, 0xb0, 0xba,
- 0x7f, 0xb2, 0x9d, 0xd2, 0xde, 0x38, 0x71, 0xe6, 0xb1, 0x38, 0xf6, 0xc8, 0x11, 0xa5, 0x2f, 0x82,
- 0x66, 0xbc, 0x7f, 0x29, 0xa7, 0x9d, 0xef, 0xfb, 0xbc, 0xe3, 0x99, 0xf1, 0xcc, 0xb0, 0xa3, 0x5b,
- 0x1d, 0x42, 0x9a, 0x81, 0xb1, 0x69, 0x32, 0xce, 0x4c, 0xea, 0x52, 0xde, 0xa1, 0x4f, 0x6c, 0x17,
- 0xc3, 0x1f, 0xdb, 0x6c, 0xf7, 0x6b, 0xa5, 0x5b, 0xbe, 0xcf, 0x9a, 0x3a, 0x14, 0x8d, 0x41, 0x63,
- 0xb4, 0x13, 0x34, 0x75, 0xc8, 0x4f, 0x58, 0x47, 0xc9, 0x18, 0x8c, 0x9c, 0x86, 0xa2, 0x49, 0x6c,
- 0x89, 0x79, 0x9f, 0x31, 0x6f, 0x4f, 0xc2, 0xd0, 0x88, 0x16, 0xa9, 0x35, 0x86, 0x0b, 0xb6, 0x9d,
- 0x69, 0x75, 0x21, 0x1d, 0x88, 0x4d, 0x12, 0x0b, 0xc8, 0x4f, 0xd9, 0x4e, 0xa6, 0xd5, 0x27, 0x79,
- 0xf7, 0xc5, 0x44, 0x62, 0x8b, 0xb4, 0x8a, 0xe0, 0x3d, 0xd6, 0x76, 0xd2, 0xde, 0x4c, 0x43, 0xd1,
- 0x26, 0x29, 0x47, 0x18, 0x0b, 0x5a, 0x97, 0x32, 0x06, 0xb1, 0xed, 0x63, 0x29, 0x30, 0xde, 0x65,
- 0x43, 0x2f, 0x75, 0xfc, 0x5d, 0x39, 0x44, 0x45, 0xa5, 0x89, 0x83, 0xc4, 0x89, 0x1d, 0xaf, 0xe4,
- 0x10, 0xfd, 0x45, 0xfa, 0x06, 0x28, 0x40, 0xe6, 0xfd, 0x15, 0x98, 0x0f, 0x58, 0x37, 0x04, 0x07,
- 0xca, 0xcd, 0x54, 0x6a, 0x40, 0x74, 0x49, 0xae, 0x53, 0xfc, 0x90, 0xb5, 0x2c, 0xdc, 0x89, 0x5d,
- 0x52, 0xd0, 0x44, 0x46, 0x2e, 0x40, 0xec, 0x0d, 0x1a, 0xa3, 0xad, 0x00, 0x4d, 0xfe, 0x96, 0xed,
- 0xcb, 0x05, 0x5c, 0x80, 0x55, 0x46, 0x67, 0x4e, 0xa7, 0x89, 0xd8, 0xa7, 0xe3, 0x4f, 0x58, 0xce,
- 0xd9, 0xa6, 0x91, 0x0a, 0xc4, 0x01, 0xa9, 0x64, 0x63, 0x75, 0x6d, 0xac, 0x23, 0xf8, 0x08, 0xb7,
- 0x10, 0x89, 0x43, 0x5f, 0xdd, 0x8a, 0xc1, 0x08, 0xe7, 0x20, 0x97, 0xee, 0xde, 0x1f, 0x38, 0xf2,
- 0x11, 0xd6, 0x28, 0xcc, 0x2f, 0xd3, 0x6a, 0x16, 0x63, 0x91, 0xf9, 0xa0, 0x85, 0xf9, 0x15, 0x18,
- 0x35, 0xea, 0x0b, 0xd4, 0x9e, 0xf9, 0xdc, 0x0b, 0xcc, 0xdf, 0xb0, 0x3d, 0x99, 0xc8, 0xe8, 0x7e,
- 0x06, 0xe6, 0x16, 0xcc, 0x34, 0x14, 0xc7, 0x74, 0x60, 0x9d, 0xe4, 0x23, 0x76, 0x50, 0x23, 0xa8,
- 0xf2, 0xcf, 0xe9, 0xdc, 0x53, 0xfa, 0xa9, 0xbf, 0x4c, 0xf4, 0xfe, 0xf7, 0x97, 0x61, 0x4f, 0xa8,
- 0x68, 0x69, 0x1d, 0xdd, 0xf8, 0xc2, 0xf7, 0x44, 0x49, 0xe0, 0x2b, 0x6a, 0x3b, 0x89, 0xa4, 0x89,
- 0x85, 0xf0, 0xaf, 0x98, 0x43, 0xac, 0x93, 0xb6, 0x13, 0x75, 0xe3, 0xc5, 0x97, 0xbe, 0x4e, 0x15,
- 0x83, 0x7e, 0xb5, 0x3d, 0x4f, 0xa3, 0x08, 0x94, 0x13, 0x27, 0xf4, 0x36, 0x15, 0x81, 0x75, 0xd0,
- 0xf6, 0x02, 0x22, 0x70, 0x20, 0x5e, 0x91, 0x58, 0x62, 0xfe, 0x81, 0x31, 0x89, 0x2e, 0x82, 0x65,
- 0x04, 0x56, 0x9c, 0x0e, 0x5a, 0xa3, 0xee, 0xbb, 0xe3, 0x71, 0x31, 0x3b, 0xe3, 0x49, 0xa9, 0x05,
- 0xb5, 0x73, 0x7c, 0xcc, 0x3a, 0x73, 0x69, 0x61, 0x9a, 0x5c, 0xa7, 0xe2, 0x35, 0xfd, 0xc3, 0xab,
- 0x7f, 0xce, 0x72, 0x25, 0x28, 0xcf, 0x0c, 0x7f, 0x36, 0x18, 0xab, 0x5c, 0x61, 0xa2, 0x0b, 0x93,
- 0x2e, 0xb3, 0x69, 0x31, 0x85, 0x05, 0xc4, 0x44, 0xe9, 0x1a, 0xff, 0xde, 0x7e, 0x18, 0x6b, 0x0c,
- 0xa6, 0x62, 0x96, 0x11, 0x5c, 0xc1, 0x9d, 0xcb, 0x87, 0xb1, 0xc4, 0x7c, 0xc8, 0x76, 0x43, 0xb8,
- 0x86, 0x44, 0xc1, 0xcc, 0x15, 0xf3, 0xd8, 0x09, 0xd6, 0xb8, 0xe1, 0xaa, 0xc9, 0x3a, 0x45, 0x7c,
- 0x18, 0x86, 0x93, 0xf3, 0x08, 0xaa, 0x30, 0x72, 0x88, 0xf5, 0x24, 0x93, 0x5e, 0xdc, 0x47, 0x51,
- 0x11, 0x78, 0x91, 0x4a, 0xe3, 0x4c, 0x1a, 0xf0, 0x83, 0x83, 0x81, 0x34, 0x83, 0x35, 0x8e, 0xfa,
- 0x92, 0xd6, 0xcd, 0x34, 0xcc, 0x17, 0x43, 0x89, 0x31, 0x49, 0x6f, 0x93, 0x7b, 0xbf, 0x1a, 0x6a,
- 0x0c, 0xfa, 0xf7, 0xe8, 0xb3, 0x56, 0xd8, 0xbb, 0x7e, 0x43, 0xac, 0x71, 0xe4, 0xff, 0x5b, 0x9a,
- 0xc0, 0xe5, 0x32, 0x2e, 0xf6, 0x44, 0x81, 0x8b, 0xa9, 0xed, 0x54, 0x53, 0xdb, 0x63, 0x6d, 0x1d,
- 0x9e, 0x4b, 0x13, 0xe6, 0xeb, 0x21, 0x47, 0x78, 0x53, 0x9c, 0x26, 0xda, 0xa5, 0xc6, 0x17, 0xdc,
- 0x6f, 0x88, 0x35, 0xae, 0xbe, 0x5b, 0xba, 0xeb, 0xbb, 0xa5, 0xc7, 0xda, 0xf3, 0xef, 0x57, 0xf7,
- 0x19, 0xd0, 0x82, 0xd8, 0x0a, 0x72, 0x74, 0x26, 0x7e, 0xaf, 0xfa, 0x8d, 0x87, 0x55, 0xbf, 0xf1,
- 0x77, 0xd5, 0x6f, 0xfc, 0x7a, 0xec, 0x6f, 0x3c, 0x3c, 0xf6, 0x37, 0xfe, 0x3c, 0xf6, 0x37, 0xe6,
- 0x6d, 0x6a, 0x92, 0xf7, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1d, 0x7e, 0x20, 0x91, 0xb0, 0x05,
- 0x00, 0x00,
+ // 714 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x54, 0xcf, 0x6e, 0x13, 0x3f,
+ 0x10, 0x6e, 0x92, 0x36, 0xdd, 0x3a, 0xfd, 0xeb, 0x5f, 0x7f, 0xc5, 0x94, 0x12, 0x45, 0x11, 0x42,
+ 0x39, 0xe5, 0x00, 0xbc, 0x40, 0xda, 0x5e, 0x22, 0x95, 0x0a, 0x6d, 0x0a, 0x77, 0xc7, 0x3b, 0x0d,
+ 0x56, 0xf6, 0x9f, 0x6c, 0xa7, 0xb4, 0x37, 0x1e, 0x81, 0xe7, 0xe1, 0x09, 0x38, 0xf6, 0xc8, 0x11,
+ 0xa5, 0x2f, 0x82, 0x66, 0xbc, 0x9b, 0xdd, 0x94, 0xd3, 0xce, 0xf7, 0x7d, 0xde, 0xf1, 0xcc, 0x78,
+ 0x66, 0xd8, 0xd1, 0x9d, 0x8e, 0x20, 0xcb, 0xc1, 0xd8, 0x2c, 0x1d, 0xe6, 0x26, 0x73, 0x19, 0x0f,
+ 0xe8, 0x93, 0xd8, 0x59, 0xff, 0xfb, 0x36, 0xdb, 0xfd, 0x52, 0xe9, 0x96, 0xef, 0xb3, 0xa6, 0x8e,
+ 0x44, 0xa3, 0xd7, 0x18, 0xec, 0x84, 0x4d, 0x1d, 0xf1, 0x53, 0x16, 0x28, 0x99, 0x80, 0x91, 0xe3,
+ 0x48, 0x34, 0x89, 0x5d, 0x61, 0xde, 0x65, 0xcc, 0xdb, 0xa3, 0x28, 0x32, 0xa2, 0x45, 0x6a, 0x8d,
+ 0xe1, 0x82, 0x6d, 0xe7, 0x5a, 0x5d, 0x4a, 0x07, 0x62, 0x93, 0xc4, 0x12, 0xf2, 0x33, 0xb6, 0x93,
+ 0x6b, 0xf5, 0x51, 0xde, 0x7f, 0x36, 0xb1, 0xd8, 0x22, 0xad, 0x22, 0xf8, 0x09, 0x6b, 0x3b, 0x69,
+ 0xe7, 0xe3, 0x48, 0xb4, 0x49, 0x2a, 0x10, 0xc6, 0x82, 0xd6, 0xb5, 0x4c, 0x40, 0x6c, 0xfb, 0x58,
+ 0x4a, 0x8c, 0x77, 0xd9, 0xc8, 0x4b, 0x81, 0xbf, 0xab, 0x80, 0xa8, 0xa8, 0x2c, 0x75, 0x90, 0x3a,
+ 0xb1, 0xe3, 0x95, 0x02, 0xa2, 0xbf, 0x58, 0xcf, 0x81, 0x02, 0x64, 0xde, 0x5f, 0x89, 0x79, 0x8f,
+ 0x75, 0x22, 0x70, 0xa0, 0xdc, 0x44, 0x65, 0x06, 0x44, 0x87, 0xe4, 0x3a, 0xc5, 0x0f, 0x59, 0xcb,
+ 0xc2, 0xbd, 0xd8, 0x25, 0x05, 0x4d, 0x64, 0xe4, 0x0c, 0xc4, 0x5e, 0xaf, 0x31, 0xd8, 0x0a, 0xd1,
+ 0xe4, 0x6f, 0xd9, 0xbe, 0x9c, 0xc1, 0x25, 0x58, 0x65, 0x74, 0xee, 0x74, 0x96, 0x8a, 0x7d, 0x3a,
+ 0xfe, 0x8c, 0xe5, 0x9c, 0x6d, 0x1a, 0xa9, 0x40, 0x1c, 0x90, 0x4a, 0x36, 0x56, 0xd7, 0x26, 0x3a,
+ 0x86, 0x2b, 0xb8, 0x83, 0x58, 0x1c, 0xfa, 0xea, 0x56, 0x0c, 0x46, 0x38, 0x05, 0xb9, 0x70, 0x0f,
+ 0xfe, 0xc0, 0x91, 0x8f, 0xb0, 0x46, 0x61, 0x7e, 0xb9, 0x56, 0x93, 0x04, 0x8b, 0xcc, 0x7b, 0x2d,
+ 0xcc, 0xaf, 0xc4, 0xa8, 0x51, 0x5f, 0xa0, 0xf6, 0x9f, 0xcf, 0xbd, 0xc4, 0xfc, 0x0d, 0xdb, 0x93,
+ 0xa9, 0x8c, 0x1f, 0x26, 0x60, 0xee, 0xc0, 0x8c, 0x23, 0x71, 0x4c, 0x07, 0xd6, 0x49, 0x3e, 0x60,
+ 0x07, 0x35, 0x82, 0x2a, 0xff, 0x3f, 0x9d, 0x7b, 0x4e, 0x3f, 0xf7, 0x97, 0x8b, 0x93, 0x7f, 0xfd,
+ 0xe5, 0xd8, 0x13, 0x2a, 0x5e, 0x58, 0x47, 0x37, 0xbe, 0xf0, 0x3d, 0xb1, 0x22, 0xf0, 0x15, 0xb5,
+ 0x1d, 0xc5, 0xd2, 0x24, 0x42, 0xf8, 0x57, 0x2c, 0x20, 0xd6, 0x49, 0xdb, 0x91, 0x9a, 0x7b, 0xf1,
+ 0xa5, 0xaf, 0x53, 0xc5, 0xa0, 0x5f, 0x6d, 0x2f, 0xb2, 0x38, 0x06, 0xe5, 0xc4, 0x29, 0xbd, 0x4d,
+ 0x45, 0x60, 0x1d, 0xb4, 0xbd, 0x84, 0x18, 0x1c, 0x88, 0x57, 0x24, 0xae, 0x30, 0xff, 0xc0, 0x98,
+ 0x44, 0x17, 0xe1, 0x22, 0x06, 0x2b, 0xce, 0x7a, 0xad, 0x41, 0xe7, 0xdd, 0xf1, 0xb0, 0x9c, 0x9d,
+ 0xe1, 0x68, 0xa5, 0x85, 0xb5, 0x73, 0x7c, 0xc8, 0x82, 0xa9, 0xb4, 0x30, 0x4e, 0x6f, 0x33, 0xf1,
+ 0x9a, 0xfe, 0xe1, 0xd5, 0x3f, 0xe7, 0x85, 0x12, 0xae, 0xce, 0xf4, 0x7f, 0x36, 0x18, 0xab, 0x5c,
+ 0x61, 0xa2, 0x33, 0x93, 0x2d, 0xf2, 0x71, 0x39, 0x85, 0x25, 0xc4, 0x44, 0xe9, 0x1a, 0xff, 0xde,
+ 0x7e, 0x18, 0x6b, 0x0c, 0xa6, 0x62, 0x16, 0x31, 0xdc, 0xc0, 0xbd, 0x2b, 0x86, 0x71, 0x85, 0x79,
+ 0x9f, 0xed, 0x46, 0x70, 0x0b, 0xa9, 0x82, 0x89, 0x2b, 0xe7, 0x31, 0x08, 0xd7, 0x38, 0x1c, 0x3b,
+ 0x6d, 0xaf, 0x74, 0x3a, 0xa7, 0x89, 0x0c, 0xc2, 0x02, 0xf9, 0x31, 0x49, 0xe7, 0x94, 0x50, 0xbb,
+ 0x1c, 0x13, 0x8f, 0xfb, 0xcb, 0x26, 0x0b, 0xca, 0x9c, 0x30, 0x74, 0x27, 0xa7, 0x31, 0x54, 0xa1,
+ 0x17, 0x10, 0xdf, 0x80, 0x4c, 0xea, 0x12, 0x1f, 0x79, 0x45, 0x60, 0x70, 0x2a, 0x4b, 0x72, 0x69,
+ 0xc0, 0x0f, 0x1b, 0x06, 0xdf, 0x0c, 0xd7, 0x38, 0xea, 0x65, 0x5a, 0x51, 0xe3, 0xa8, 0x58, 0x26,
+ 0x2b, 0x8c, 0x85, 0xf1, 0x36, 0xb9, 0xf7, 0xeb, 0xa4, 0xc6, 0xa0, 0x7f, 0x8f, 0x3e, 0x69, 0x85,
+ 0xfd, 0xee, 0x93, 0x58, 0xe3, 0xc8, 0xff, 0xd7, 0x2c, 0x85, 0xeb, 0x45, 0x52, 0xee, 0x96, 0x12,
+ 0x97, 0x93, 0x1e, 0x54, 0x93, 0x8e, 0xa5, 0x8a, 0x2e, 0xa4, 0x89, 0x8a, 0x95, 0x52, 0x20, 0xbc,
+ 0x29, 0xc9, 0x52, 0xed, 0x32, 0xe3, 0x1f, 0xc9, 0x6f, 0x95, 0x35, 0xae, 0xbe, 0x8f, 0x3a, 0xeb,
+ 0xfb, 0xe8, 0x84, 0xb5, 0xa7, 0xdf, 0x6e, 0x1e, 0x72, 0xa0, 0xa5, 0xb2, 0x15, 0x16, 0xe8, 0x5c,
+ 0xfc, 0x5a, 0x76, 0x1b, 0x8f, 0xcb, 0x6e, 0xe3, 0xcf, 0xb2, 0xdb, 0xf8, 0xf1, 0xd4, 0xdd, 0x78,
+ 0x7c, 0xea, 0x6e, 0xfc, 0x7e, 0xea, 0x6e, 0x4c, 0xdb, 0xd4, 0x58, 0xef, 0xff, 0x06, 0x00, 0x00,
+ 0xff, 0xff, 0x8c, 0xd7, 0x5d, 0xad, 0xe4, 0x05, 0x00, 0x00,
}
func (m *Videopersons) Marshal() (dAtA []byte, err error) {
@@ -828,6 +845,22 @@
}
i++
}
+ if m.IsLink {
+ dAtA[i] = 0x28
+ i++
+ if m.IsLink {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i++
+ }
+ if len(m.LinkInfo) > 0 {
+ dAtA[i] = 0x32
+ i++
+ i = encodeVarintVideoperson(dAtA, i, uint64(len(m.LinkInfo)))
+ i += copy(dAtA[i:], m.LinkInfo)
+ }
return i, nil
}
@@ -1077,6 +1110,13 @@
}
if m.DefenceState {
n += 2
+ }
+ if m.IsLink {
+ n += 2
+ }
+ l = len(m.LinkInfo)
+ if l > 0 {
+ n += 1 + l + sovVideoperson(uint64(l))
}
return n
}
@@ -2233,6 +2273,58 @@
}
}
m.DefenceState = bool(v != 0)
+ case 5:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field IsLink", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowVideoperson
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.IsLink = bool(v != 0)
+ case 6:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field LinkInfo", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowVideoperson
+ }
+ 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 ErrInvalidLengthVideoperson
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthVideoperson
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.LinkInfo = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipVideoperson(dAtA[iNdEx:])
--
Gitblit v1.8.0