From 5c98f1cb4f72f944f775638db5377725bdfd2c46 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 23 六月 2020 15:03:03 +0800
Subject: [PATCH] fix CameraRules
---
protomsg.proto | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index e715277..2bc753b 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -92,24 +92,32 @@
repeated Point points = 3;//鐐圭殑闆嗗悎
}
-message CameraRules {
- string camera_id = 1;
+message CameraInfo {
+ string runServerName = 1;
+ string id = 2;
+ string name = 3;
+ int32 run_type= 4;
+}
+message CameraAndRules {
+ CameraInfo cameraInfo = 1;
repeated GroupRule rules = 2;
}
message GroupRule {
- string group_id = 1;
- string group_text = 2;
- int32 alarm_level = 3;
- repeated Rule rules = 4;
- string set_type = 5;
+ repeated string cameraIds = 1;
+ string id = 2;
- string template_id = 6;
- string template_rule = 7;
- string time_rule_id = 8;
- string scene_name = 9;
- string desc = 10;
- bool enable = 11;
+ string group_text = 3;
+ int32 alarm_level = 4;
+ repeated Rule rules = 5;
+ string set_type = 6;
+
+ string template_id = 7;
+ string template_rule = 8;
+ string time_rule_id = 9;
+ string scene_name = 10;
+ string desc = 11;
+ bool enable = 12;
}
message Rule {
--
Gitblit v1.8.0