From f0a55188a489ef6e9ef9be3ee02dec07d9efc00d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 20 十一月 2019 16:51:28 +0800
Subject: [PATCH] fix alarmLevel to string
---
protomsg.proto | 2
protomsg.pb.go | 255 +++++++++++++++++++--------------------------------
2 files changed, 96 insertions(+), 161 deletions(-)
diff --git a/protomsg.pb.go b/protomsg.pb.go
index 8a421d2..32144ca 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -9,6 +9,7 @@
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
)
// Reference imports to suppress errors if they are not otherwise used.
@@ -2119,7 +2120,7 @@
Tasks []string `protobuf:"bytes,4,rep,name=tasks,proto3" json:"tasks,omitempty"`
TreeNodes []string `protobuf:"bytes,5,rep,name=treeNodes,proto3" json:"treeNodes,omitempty"`
Tabs []string `protobuf:"bytes,6,rep,name=tabs,proto3" json:"tabs,omitempty"`
- AlarmLevel []int32 `protobuf:"varint,7,rep,packed,name=alarmLevel,proto3" json:"alarmLevel,omitempty"`
+ AlarmLevel string `protobuf:"bytes,7,opt,name=alarmLevel,proto3" json:"alarmLevel,omitempty"`
SearchTime []string `protobuf:"bytes,8,rep,name=searchTime,proto3" json:"searchTime,omitempty"`
InputValue string `protobuf:"bytes,9,opt,name=inputValue,proto3" json:"inputValue,omitempty"`
Collection string `protobuf:"bytes,10,opt,name=collection,proto3" json:"collection,omitempty"`
@@ -2202,11 +2203,11 @@
return nil
}
-func (m *CompareArgs) GetAlarmLevel() []int32 {
+func (m *CompareArgs) GetAlarmLevel() string {
if m != nil {
return m.AlarmLevel
}
- return nil
+ return ""
}
func (m *CompareArgs) GetSearchTime() []string {
@@ -2948,7 +2949,7 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 2551 bytes of a gzipped FileDescriptorProto
+ // 2550 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x38, 0xcb, 0x6e, 0x1c, 0xc7,
0xb5, 0xec, 0x79, 0xcf, 0x99, 0x19, 0xaa, 0x55, 0xd2, 0xb5, 0x5b, 0xf2, 0x35, 0x4d, 0xf7, 0x95,
0x61, 0x5d, 0xc1, 0xf6, 0xbd, 0x90, 0xbd, 0x08, 0xb2, 0x08, 0x30, 0xd6, 0x23, 0x18, 0xc0, 0x71,
@@ -3058,57 +3059,57 @@
0x5c, 0x1a, 0x2d, 0x7a, 0xd1, 0x35, 0x3c, 0x3b, 0x84, 0xd9, 0x29, 0xdf, 0x88, 0xe7, 0x82, 0x97,
0x95, 0x32, 0xfe, 0x9c, 0x47, 0x6d, 0x14, 0xea, 0x65, 0xb6, 0xbe, 0x01, 0x3d, 0x63, 0x00, 0xdc,
0xdc, 0x4b, 0x25, 0xc4, 0xe7, 0x79, 0x22, 0x4c, 0x1b, 0x98, 0x46, 0x0d, 0x82, 0x34, 0xe0, 0x6b,
- 0xa7, 0x17, 0x9d, 0xd9, 0x01, 0xb4, 0x46, 0x8f, 0x60, 0x7c, 0xd8, 0xdf, 0x19, 0x46, 0x0e, 0x00,
- 0xb4, 0xe0, 0x6a, 0x73, 0x76, 0x62, 0xda, 0x00, 0x7e, 0xd9, 0xc2, 0x20, 0x3d, 0xcd, 0x8a, 0xca,
- 0x24, 0xa4, 0xeb, 0x02, 0x0d, 0x06, 0xe9, 0x9b, 0x5c, 0x4a, 0x13, 0x2c, 0xb6, 0x0d, 0xb4, 0x30,
- 0x64, 0xed, 0xbc, 0x52, 0x9b, 0xba, 0x11, 0x18, 0x88, 0x3d, 0x80, 0x05, 0xcf, 0xb8, 0xbc, 0x72,
- 0x5b, 0xb2, 0x6d, 0xa8, 0x5d, 0x64, 0xb8, 0x86, 0xb9, 0x35, 0xff, 0xb3, 0x4b, 0x91, 0x95, 0xec,
- 0x07, 0x30, 0x15, 0x78, 0xc0, 0x4e, 0x69, 0x33, 0xf8, 0x7e, 0x6b, 0x71, 0x6e, 0xb1, 0x22, 0x47,
- 0xd4, 0x30, 0x53, 0x9a, 0xf0, 0x2b, 0x99, 0x73, 0xe3, 0x94, 0x79, 0xe4, 0xc0, 0xf0, 0x17, 0xb0,
- 0x7f, 0x9c, 0x9c, 0xbb, 0x6f, 0xf9, 0xe6, 0xec, 0x5a, 0x4e, 0x06, 0x38, 0x80, 0xae, 0xa5, 0xa8,
- 0x33, 0xd2, 0x81, 0x2c, 0x84, 0xb9, 0xf5, 0xed, 0xf1, 0x26, 0xb7, 0x8e, 0xec, 0x45, 0x1d, 0x5c,
- 0x18, 0x81, 0xdf, 0xdc, 0x1f, 0x09, 0x5d, 0xc9, 0x92, 0xfd, 0x08, 0x16, 0x9b, 0x36, 0x82, 0x82,
- 0x69, 0xf6, 0x38, 0xe8, 0x34, 0x92, 0x96, 0x48, 0x51, 0x97, 0x3d, 0xfc, 0x55, 0x1f, 0xa6, 0xa4,
- 0xe6, 0x51, 0xa5, 0xcf, 0x5e, 0x6b, 0xc6, 0x7f, 0xdb, 0xee, 0x1e, 0x66, 0x7f, 0x30, 0x39, 0x44,
- 0x6b, 0xc6, 0x31, 0xed, 0x10, 0xf7, 0x80, 0x56, 0x98, 0x18, 0x17, 0x09, 0x5b, 0x46, 0x10, 0x7e,
- 0x96, 0xd1, 0xbc, 0x98, 0xea, 0x58, 0xf3, 0x32, 0xd5, 0xa7, 0x57, 0x31, 0x97, 0x26, 0xa3, 0x26,
- 0xd1, 0x3c, 0xd5, 0xc7, 0x06, 0xb9, 0x94, 0x12, 0xeb, 0x16, 0xcd, 0x4f, 0x34, 0x13, 0x8f, 0xec,
- 0xdf, 0x2f, 0x95, 0x14, 0x34, 0x12, 0x37, 0x3d, 0x7b, 0xdc, 0xe9, 0xd9, 0x6f, 0xc1, 0xd4, 0x6c,
- 0x68, 0xcd, 0x34, 0x37, 0xa1, 0xf5, 0x0c, 0x3d, 0xf6, 0x0e, 0xcc, 0x88, 0x68, 0x37, 0xcc, 0x69,
- 0xb3, 0xbd, 0xd9, 0x05, 0xf3, 0xff, 0x60, 0x92, 0x16, 0x71, 0x91, 0xab, 0x52, 0x07, 0xb0, 0xdb,
- 0xf1, 0xd1, 0x30, 0xab, 0xe2, 0x28, 0x57, 0x65, 0x34, 0x4e, 0xe9, 0x57, 0xb3, 0xf7, 0x60, 0x50,
- 0x29, 0xa9, 0x83, 0xd9, 0x6e, 0xd7, 0x46, 0xe6, 0x17, 0x4a, 0x46, 0x44, 0x66, 0x1f, 0xba, 0xee,
- 0x3e, 0xdf, 0x5d, 0x59, 0x6a, 0x93, 0xb7, 0x7a, 0x7c, 0xf8, 0xb5, 0x07, 0x8b, 0x0e, 0xe1, 0x9a,
- 0x3f, 0xd0, 0xf6, 0x79, 0x91, 0x6e, 0xda, 0x7f, 0x22, 0x4c, 0x09, 0x43, 0x8a, 0xe2, 0x3e, 0x49,
- 0x64, 0xae, 0xb6, 0xf5, 0x3e, 0x89, 0x08, 0xec, 0xd1, 0xed, 0x76, 0x3f, 0xf8, 0xbe, 0x81, 0x78,
- 0x78, 0xc3, 0x40, 0x4c, 0xff, 0x6d, 0x49, 0x61, 0xbb, 0xec, 0xc8, 0x2e, 0xf2, 0x95, 0x14, 0x26,
- 0x7f, 0x43, 0x58, 0x50, 0x92, 0xc4, 0x45, 0xa5, 0xcf, 0xb0, 0xe7, 0x98, 0x1a, 0x3f, 0x13, 0x4e,
- 0xa3, 0x55, 0x12, 0xbe, 0x00, 0x68, 0xcc, 0x89, 0xe2, 0xba, 0xbf, 0xbb, 0x0a, 0x57, 0xc2, 0x0d,
- 0x62, 0xd5, 0xfc, 0xcd, 0xd7, 0x6b, 0xfd, 0xcd, 0xf7, 0xaa, 0x85, 0xeb, 0x63, 0x18, 0x5b, 0xc3,
- 0xbb, 0xf9, 0xd4, 0x6b, 0xe6, 0xd3, 0x57, 0x8c, 0x79, 0xe1, 0xef, 0x3c, 0x23, 0xcc, 0xb2, 0x2c,
- 0x31, 0x55, 0xdf, 0x84, 0xb1, 0x13, 0xdc, 0x8e, 0x89, 0x05, 0xc9, 0xcc, 0x42, 0xe8, 0x6f, 0xf8,
- 0x05, 0x7d, 0x7c, 0xd3, 0x9f, 0x6b, 0x48, 0x6c, 0x6b, 0x52, 0xef, 0x38, 0x56, 0x93, 0x04, 0xc3,
- 0xcf, 0x12, 0x5b, 0xa3, 0x38, 0x18, 0x14, 0x4d, 0xe3, 0xf7, 0x60, 0x22, 0xf3, 0x0d, 0x97, 0x68,
- 0x06, 0xbb, 0xa0, 0x11, 0xbc, 0x2a, 0xf0, 0x62, 0x6a, 0x37, 0xf4, 0x47, 0xed, 0xa8, 0xdb, 0x7f,
- 0xc2, 0xbf, 0x78, 0x70, 0xe7, 0x99, 0x3e, 0x12, 0x4a, 0xe7, 0xd9, 0x13, 0xbe, 0x39, 0xb3, 0x33,
- 0x07, 0xfb, 0xc0, 0xf6, 0x1f, 0x53, 0xd6, 0x5a, 0xa5, 0xe0, 0x99, 0x6e, 0xb1, 0x25, 0xb6, 0xfd,
- 0xde, 0xb3, 0x9d, 0xc8, 0x8c, 0x09, 0xfd, 0xba, 0x28, 0x99, 0xd5, 0xad, 0xa0, 0xdb, 0x5b, 0x6a,
- 0x19, 0xc4, 0x8a, 0x6a, 0xd9, 0xa9, 0xed, 0x3a, 0x36, 0xcf, 0x2d, 0xd8, 0x9a, 0x6d, 0x86, 0xdf,
- 0x3b, 0xdb, 0x74, 0xff, 0xd9, 0x1b, 0x3a, 0xef, 0x3c, 0xfa, 0x83, 0x07, 0xf3, 0xf6, 0x1c, 0xc5,
- 0xe6, 0x30, 0x39, 0x89, 0x8d, 0xcd, 0xfd, 0x3d, 0xe6, 0xc3, 0xdc, 0x41, 0x38, 0xea, 0xfb, 0x1e,
- 0xbb, 0x0b, 0x7e, 0x1b, 0x83, 0x4d, 0xd6, 0xef, 0x31, 0x80, 0xd1, 0x49, 0x4c, 0x1c, 0x7d, 0xb6,
- 0x80, 0xa9, 0x39, 0x1f, 0x27, 0xe7, 0xfe, 0x80, 0xdd, 0x86, 0x45, 0x0d, 0x62, 0xb2, 0xf9, 0x43,
- 0x36, 0x85, 0xe1, 0x49, 0x8c, 0xd4, 0x11, 0xbb, 0x03, 0xb7, 0xdc, 0x75, 0x76, 0xc0, 0xf2, 0xc7,
- 0x6c, 0x1f, 0xe0, 0x24, 0x3e, 0xb1, 0x7f, 0xd0, 0xf8, 0x13, 0x23, 0x93, 0x69, 0x31, 0xfe, 0xd4,
- 0xc8, 0x74, 0x94, 0x4b, 0xf9, 0x24, 0xcf, 0x4e, 0xd3, 0xad, 0x0f, 0x8f, 0x3e, 0x82, 0x89, 0x53,
- 0x18, 0x25, 0x59, 0x65, 0x5a, 0xa8, 0xd2, 0xdf, 0xc3, 0xf3, 0x0b, 0x5a, 0x7f, 0x7c, 0x0f, 0xcf,
- 0x4f, 0x85, 0x14, 0xa5, 0xf0, 0x7b, 0x8f, 0x96, 0xe0, 0xef, 0x76, 0x1e, 0x76, 0x0b, 0x66, 0x91,
- 0x58, 0x65, 0x69, 0x49, 0xae, 0xf3, 0xf7, 0x10, 0x61, 0x3e, 0x36, 0x08, 0x8f, 0xcd, 0x60, 0x6c,
- 0xbf, 0xf2, 0x7b, 0x8f, 0x3e, 0x81, 0xfd, 0xae, 0x97, 0x8d, 0xda, 0x4f, 0xd7, 0x64, 0x4c, 0x7f,
- 0xcf, 0x28, 0x66, 0x41, 0x13, 0x3a, 0xbe, 0xf7, 0x69, 0xf0, 0xc7, 0x6f, 0x0e, 0xbc, 0xaf, 0xbe,
- 0x39, 0xf0, 0xfe, 0xfa, 0xcd, 0x81, 0xf7, 0x9b, 0x6f, 0x0f, 0xf6, 0xbe, 0xfa, 0xf6, 0x60, 0xef,
- 0xcf, 0xdf, 0x1e, 0xec, 0xad, 0x47, 0xe4, 0xba, 0x8f, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0xb7,
- 0x29, 0x90, 0xe3, 0xe8, 0x18, 0x00, 0x00,
+ 0xa7, 0x17, 0x9d, 0xd9, 0x01, 0xb4, 0x46, 0x0f, 0xeb, 0xc0, 0xf6, 0x30, 0x72, 0x00, 0xa0, 0x05,
+ 0x57, 0x9b, 0xb3, 0x13, 0xd3, 0x06, 0xf0, 0xcb, 0x16, 0x06, 0xe9, 0x69, 0x56, 0x54, 0x26, 0x21,
+ 0x5d, 0x17, 0x68, 0x30, 0x48, 0xdf, 0xe4, 0x52, 0x9a, 0x60, 0xb1, 0x6d, 0xa0, 0x85, 0x21, 0x6b,
+ 0xe7, 0x95, 0xda, 0xd4, 0x8d, 0xc0, 0x40, 0xec, 0x01, 0x2c, 0x78, 0xc6, 0xe5, 0x95, 0xdb, 0x92,
+ 0x6d, 0x43, 0xed, 0x22, 0xc3, 0x35, 0xcc, 0xad, 0xf9, 0x9f, 0x5d, 0x8a, 0xac, 0x64, 0x3f, 0x80,
+ 0xa9, 0xc0, 0x03, 0x76, 0x4a, 0x9b, 0xc1, 0xf7, 0x5b, 0x8b, 0x73, 0x8b, 0x15, 0x39, 0xa2, 0x86,
+ 0x99, 0xd2, 0x84, 0x5f, 0xc9, 0x9c, 0x1b, 0xa7, 0xcc, 0x23, 0x07, 0x86, 0xbf, 0x80, 0xfd, 0xe3,
+ 0xe4, 0xdc, 0x7d, 0xcb, 0x37, 0x67, 0xd7, 0x72, 0x32, 0xc0, 0x01, 0x74, 0x2d, 0x45, 0x9d, 0x91,
+ 0x0e, 0x64, 0x21, 0xcc, 0xad, 0x6f, 0x8f, 0x37, 0xb9, 0x75, 0x64, 0x2f, 0xea, 0xe0, 0xc2, 0x08,
+ 0xfc, 0xe6, 0xfe, 0x48, 0xe8, 0x4a, 0x96, 0xec, 0x47, 0xb0, 0xd8, 0xb4, 0x11, 0x14, 0x4c, 0xb3,
+ 0xc7, 0x41, 0xa7, 0x91, 0xb4, 0x44, 0x8a, 0xba, 0xec, 0xe1, 0xaf, 0xfa, 0x30, 0x25, 0x35, 0x8f,
+ 0x2a, 0x7d, 0xf6, 0x5a, 0x33, 0xfe, 0xdb, 0x76, 0xf7, 0x30, 0xfb, 0x83, 0xc9, 0x21, 0x5a, 0x33,
+ 0x8e, 0x69, 0x87, 0xb8, 0x07, 0xb4, 0xc2, 0xc4, 0xb8, 0x48, 0xd8, 0x32, 0x82, 0xf0, 0xb3, 0x8c,
+ 0xe6, 0xc5, 0x54, 0xc7, 0x9a, 0x97, 0xa9, 0x3e, 0xbd, 0x8a, 0xb9, 0x34, 0x19, 0x35, 0x89, 0xe6,
+ 0xa9, 0x3e, 0x36, 0xc8, 0xa5, 0x94, 0x58, 0xb7, 0x68, 0x7e, 0xa2, 0x99, 0x78, 0x64, 0xff, 0x7e,
+ 0xa9, 0xa4, 0xa0, 0x91, 0xb8, 0xe9, 0xd9, 0xe3, 0x4e, 0xcf, 0x7e, 0x0b, 0xa6, 0x66, 0x43, 0x6b,
+ 0xa6, 0xb9, 0x09, 0xad, 0x67, 0xe8, 0xb1, 0x77, 0x60, 0x46, 0x44, 0xbb, 0x61, 0x4e, 0x9b, 0xed,
+ 0xcd, 0x2e, 0x98, 0xff, 0x07, 0x93, 0xb4, 0x88, 0x8b, 0x5c, 0x95, 0x3a, 0x80, 0xdd, 0x8e, 0x8f,
+ 0x86, 0x59, 0x15, 0x47, 0xb9, 0x2a, 0xa3, 0x71, 0x4a, 0xbf, 0x9a, 0xbd, 0x07, 0x83, 0x4a, 0x49,
+ 0x1d, 0xcc, 0x76, 0xbb, 0x36, 0x32, 0xbf, 0x50, 0x32, 0x22, 0x32, 0xfb, 0xd0, 0x75, 0xf7, 0xf9,
+ 0xee, 0xca, 0x52, 0x9b, 0xbc, 0xd5, 0xe3, 0xc3, 0xaf, 0x3d, 0x58, 0x74, 0x08, 0xd7, 0xfc, 0x81,
+ 0xb6, 0xcf, 0x8b, 0x74, 0xd3, 0xfe, 0x13, 0x61, 0x4a, 0x18, 0x52, 0x14, 0xf7, 0x49, 0x22, 0x73,
+ 0xb5, 0xad, 0xf7, 0x49, 0x44, 0x60, 0x8f, 0x6e, 0xb7, 0xfb, 0xc1, 0xf7, 0x0d, 0xc4, 0xc3, 0x1b,
+ 0x06, 0x62, 0xfa, 0x6f, 0x4b, 0x0a, 0xdb, 0x65, 0x47, 0x76, 0x91, 0xaf, 0xa4, 0x30, 0xf9, 0x1b,
+ 0xc2, 0x82, 0x92, 0x24, 0x2e, 0x2a, 0x7d, 0x86, 0x3d, 0xc7, 0x94, 0x88, 0x99, 0x70, 0x1a, 0xad,
+ 0x92, 0xf0, 0x05, 0x40, 0x63, 0x4e, 0x14, 0xd7, 0xfd, 0xdd, 0x55, 0xb8, 0x12, 0x6e, 0x10, 0xab,
+ 0xe6, 0x6f, 0xbe, 0x5e, 0xeb, 0x6f, 0xbe, 0x57, 0x2d, 0x5c, 0x1f, 0xc3, 0xd8, 0x1a, 0xde, 0xcd,
+ 0xa7, 0x5e, 0x33, 0x9f, 0xbe, 0x62, 0xcc, 0x0b, 0x7f, 0xe7, 0x19, 0x61, 0x96, 0x65, 0x89, 0xa9,
+ 0xfa, 0x26, 0x8c, 0x9d, 0xe0, 0x76, 0x4c, 0x2c, 0x48, 0x66, 0x16, 0x42, 0x7f, 0xc3, 0x2f, 0xe8,
+ 0xe3, 0x9b, 0xfe, 0x5c, 0x43, 0x62, 0x5b, 0x93, 0x7a, 0xc7, 0xb1, 0x9a, 0x24, 0x18, 0x7e, 0x96,
+ 0xd8, 0x1a, 0xc5, 0xc1, 0xa0, 0x68, 0x1a, 0xbf, 0x07, 0x13, 0x99, 0x6f, 0xb8, 0x44, 0x33, 0xd8,
+ 0x05, 0x8d, 0xe0, 0x55, 0x81, 0x17, 0x53, 0xbb, 0xa1, 0x3f, 0x6a, 0x47, 0xdd, 0xfe, 0x13, 0xfe,
+ 0xc5, 0x83, 0x3b, 0xcf, 0xf4, 0x91, 0x50, 0x3a, 0xcf, 0x9e, 0xf0, 0xcd, 0x99, 0x9d, 0x39, 0xd8,
+ 0x07, 0xb6, 0xff, 0x98, 0xb2, 0xd6, 0x2a, 0x05, 0xcf, 0x74, 0x8b, 0x2d, 0xb1, 0xed, 0xf7, 0x9e,
+ 0xed, 0x44, 0x66, 0x4c, 0xe8, 0xd7, 0x45, 0xc9, 0xac, 0x6e, 0x05, 0xdd, 0xde, 0x52, 0xcb, 0x20,
+ 0x56, 0x54, 0xcb, 0x4e, 0x6d, 0xd7, 0xb1, 0x79, 0x6e, 0xc1, 0xd6, 0x6c, 0x33, 0xfc, 0xde, 0xd9,
+ 0xa6, 0xfb, 0xcf, 0xde, 0xd0, 0x79, 0xe7, 0xd1, 0x1f, 0x3c, 0x98, 0xb7, 0xe7, 0x28, 0x36, 0x87,
+ 0xc9, 0x49, 0x6c, 0x6c, 0xee, 0xef, 0x31, 0x1f, 0xe6, 0x0e, 0xc2, 0x51, 0xdf, 0xf7, 0xd8, 0x5d,
+ 0xf0, 0xdb, 0x18, 0x6c, 0xb2, 0x7e, 0x8f, 0x01, 0x8c, 0x4e, 0x62, 0xe2, 0xe8, 0xb3, 0x05, 0x4c,
+ 0xcd, 0xf9, 0x38, 0x39, 0xf7, 0x07, 0xec, 0x36, 0x2c, 0x6a, 0x10, 0x93, 0xcd, 0x1f, 0xb2, 0x29,
+ 0x0c, 0x4f, 0x62, 0xa4, 0x8e, 0xd8, 0x1d, 0xb8, 0xe5, 0xae, 0xb3, 0x03, 0x96, 0x3f, 0x66, 0xfb,
+ 0x00, 0x27, 0xf1, 0x89, 0xfd, 0x83, 0xc6, 0x9f, 0x18, 0x99, 0x4c, 0x8b, 0xf1, 0xa7, 0x46, 0xa6,
+ 0xa3, 0x5c, 0xca, 0x27, 0x79, 0x76, 0x9a, 0x6e, 0x7d, 0x78, 0xf4, 0x11, 0x4c, 0x9c, 0xc2, 0x28,
+ 0xc9, 0x2a, 0xd3, 0x42, 0x95, 0xfe, 0x1e, 0x9e, 0x5f, 0xd0, 0xfa, 0xe3, 0x7b, 0x78, 0x7e, 0x2a,
+ 0xa4, 0x28, 0x85, 0xdf, 0x7b, 0xb4, 0x04, 0x7f, 0xb7, 0xf3, 0xb0, 0x5b, 0x30, 0x8b, 0xc4, 0x2a,
+ 0x4b, 0x4b, 0x72, 0x9d, 0xbf, 0x87, 0x08, 0xf3, 0xb1, 0x41, 0x78, 0x6c, 0x06, 0x63, 0xfb, 0x95,
+ 0xdf, 0x7b, 0xf4, 0x09, 0xec, 0x77, 0xbd, 0x6c, 0xd4, 0x7e, 0xba, 0x26, 0x63, 0xfa, 0x7b, 0x46,
+ 0x31, 0x0b, 0x9a, 0xd0, 0xf1, 0xbd, 0x4f, 0x83, 0x3f, 0x7e, 0x73, 0xe0, 0x7d, 0xf5, 0xcd, 0x81,
+ 0xf7, 0xd7, 0x6f, 0x0e, 0xbc, 0xdf, 0x7c, 0x7b, 0xb0, 0xf7, 0xd5, 0xb7, 0x07, 0x7b, 0x7f, 0xfe,
+ 0xf6, 0x60, 0x6f, 0x3d, 0x22, 0xd7, 0x7d, 0xfc, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x89, 0xae,
+ 0x59, 0xd6, 0xe8, 0x18, 0x00, 0x00,
}
func (m *Area) Marshal() (dAtA []byte, err error) {
@@ -4582,22 +4583,10 @@
}
}
if len(m.AlarmLevel) > 0 {
- dAtA5 := make([]byte, len(m.AlarmLevel)*10)
- var j4 int
- for _, num1 := range m.AlarmLevel {
- num := uint64(num1)
- for num >= 1<<7 {
- dAtA5[j4] = uint8(uint64(num)&0x7f | 0x80)
- num >>= 7
- j4++
- }
- dAtA5[j4] = uint8(num)
- j4++
- }
dAtA[i] = 0x3a
i++
- i = encodeVarintProtomsg(dAtA, i, uint64(j4))
- i += copy(dAtA[i:], dAtA5[:j4])
+ i = encodeVarintProtomsg(dAtA, i, uint64(len(m.AlarmLevel)))
+ i += copy(dAtA[i:], m.AlarmLevel)
}
if len(m.SearchTime) > 0 {
for _, s := range m.SearchTime {
@@ -5014,11 +5003,11 @@
dAtA[i] = 0x12
i++
i = encodeVarintProtomsg(dAtA, i, uint64(m.Cam.Size()))
- n6, err6 := m.Cam.MarshalTo(dAtA[i:])
- if err6 != nil {
- return 0, err6
+ n4, err4 := m.Cam.MarshalTo(dAtA[i:])
+ if err4 != nil {
+ return 0, err4
}
- i += n6
+ i += n4
}
if len(m.ServerId) > 0 {
dAtA[i] = 0x1a
@@ -5901,12 +5890,9 @@
n += 1 + l + sovProtomsg(uint64(l))
}
}
- if len(m.AlarmLevel) > 0 {
- l = 0
- for _, e := range m.AlarmLevel {
- l += sovProtomsg(uint64(e))
- }
- n += 1 + sovProtomsg(uint64(l)) + l
+ l = len(m.AlarmLevel)
+ if l > 0 {
+ n += 1 + l + sovProtomsg(uint64(l))
}
if len(m.SearchTime) > 0 {
for _, s := range m.SearchTime {
@@ -6182,14 +6168,7 @@
}
func sovProtomsg(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozProtomsg(x uint64) (n int) {
return sovProtomsg(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -11581,81 +11560,37 @@
m.Tabs = append(m.Tabs, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
case 7:
- if wireType == 0 {
- var v int32
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowProtomsg
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- v |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- m.AlarmLevel = append(m.AlarmLevel, v)
- } else if wireType == 2 {
- var packedLen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowProtomsg
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- packedLen |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if packedLen < 0 {
- return ErrInvalidLengthProtomsg
- }
- postIndex := iNdEx + packedLen
- if postIndex < 0 {
- return ErrInvalidLengthProtomsg
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- var elementCount int
- var count int
- for _, integer := range dAtA[iNdEx:postIndex] {
- if integer < 128 {
- count++
- }
- }
- elementCount = count
- if elementCount != 0 && len(m.AlarmLevel) == 0 {
- m.AlarmLevel = make([]int32, 0, elementCount)
- }
- for iNdEx < postIndex {
- var v int32
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowProtomsg
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- v |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- m.AlarmLevel = append(m.AlarmLevel, v)
- }
- } else {
+ if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field AlarmLevel", wireType)
}
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowProtomsg
+ }
+ 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 ErrInvalidLengthProtomsg
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthProtomsg
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.AlarmLevel = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
case 8:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field SearchTime", wireType)
diff --git a/protomsg.proto b/protomsg.proto
index 8c4b6e9..ac4f27e 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -254,7 +254,7 @@
repeated string tasks = 4;
repeated string treeNodes = 5;
repeated string tabs = 6;
- repeated int32 alarmLevel = 7;
+ string alarmLevel = 7;
repeated string searchTime = 8;
string inputValue = 9;
string collection = 10;
--
Gitblit v1.8.0