From 0ebe78959ed7ccfd6d71c9317c6771d88a240c0b Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 14 六月 2019 10:32:23 +0800
Subject: [PATCH] fix GroupRule
---
protomsg.proto | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index c87ff7c..38ec79c 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -89,8 +89,7 @@
message CameraTimerule {
string id = 1;//id
string name = 2;//瑙勫垯鍚嶇О
- string camera_id = 3;//鎽勫儚鏈篿d
- repeated DayCtl time_rule = 4;//鍏蜂綋鏃堕棿瑙勫垯璁剧疆
+ string time_rule = 3;//鍏蜂綋鏃堕棿瑙勫垯璁剧疆
}
//DayCtl struct 姣忓ぉ鐨勬椂闂存帶鍒惰鍒�
@@ -109,10 +108,25 @@
message Polygon {
string id = 1;//褰㈢姸id
string name = 2;//褰㈢姸鐨勫悕绉�
- repeated Point points = 4;//鐐圭殑闆嗗悎
+ repeated Point points = 3;//鐐圭殑闆嗗悎
}
message CameraTaskArgs {
+ string camera_id = 1;
+ repeated TaskGroupArgs task_args = 2;
+}
+
+message TaskGroupArgs {
+ string task_id = 1;
+ repeated GroupRule group_rules = 2;
+}
+
+message GroupRule {
+ string group_id = 1;
+ repeated GroupRule rules = 2;
+}
+
+message Rule {
string id =1;
string camera_task_id =2;
string camera_id =3;
@@ -123,9 +137,8 @@
string operator_type = 8;
string sdk_arg_value = 9;
int32 sort = 10;
- string rule_with_next = 11;
+ string rule_with_pre = 11;
string group_id =12;
-
}
//Sdk struct
@@ -259,25 +272,4 @@
string direction_line = 6;
string type = 7;
int32 defence_state = 8;
-}
-
-message CameraTaskArg {
- string id = 1;
- string camera_task_id = 2;
- string camera_id = 3;
- string polygon_id = 4;
- string sdk_id = 5;
- string sdk_arg_alias = 6;
- string operator = 7;
- string operator_type = 8;
- string sdk_arg_value = 9;
- int32 sort = 10;
- string rule_with_pre = 11;
- string group_id = 12;
-}
-
-message CameraTimeRule {
- string id = 1;
- string name = 3;
- string time_rule = 4;
}
\ No newline at end of file
--
Gitblit v1.8.0