From 59f2e381bf8b734d1827d69908bd97e017064dbd Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 23 六月 2020 13:47:06 +0800
Subject: [PATCH] rm Task,CameraTask,CameraTaskArgs add CameraRule
---
protomsg.proto | 145 ++++++++++++++++--------------------------------
1 files changed, 48 insertions(+), 97 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index d5d3625..e715277 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -60,54 +60,11 @@
string link_task_id = 2;
}
-//鎽勫儚鏈虹殑浠诲姟淇℃伅
-message CameraAndTaskInfo {
- Camera camera = 1;//鎽勫儚鏈轰俊鎭�
- repeated Task tasks = 2;//浠诲姟鍒楄〃
-}
-
-//Task缁撴瀯浣�
-message Task {
- string taskid = 1;
- string taskname = 2;
- string create_at = 3;
- string create_by = 4;
- string update_at = 5;
- bool enable = 6;
- bool is_alarm = 7;
- bool del_flag = 8;
-}
-
-message TaskSdkInfo {
- Task task = 1;
- repeated Sdk sdks = 2;
-}
-
message SdkRun {
string ipc_id = 1;
string sdk_type = 2;
}
-message TaskSdkRun {
- Task task = 1;
- repeated SdkRun sdks = 2;
-}
-
-//鎽勫儚鏈轰换鍔�
-message CameraTask {
- string id = 1;
- string camera_id = 2;//鎽勫儚鏈篿d
- string task_id = 3;//浠诲姟id
- string time_rule = 4;//甯冮槻鏃堕棿
- string react_rule = 5;//鑱斿姩鏂瑰紡
- string react_device = 6;//鑱斿姩璁惧
- bool del_flag = 7; //閫昏緫鍒犻櫎鏍囪
- bool update_flag = 8;//鏄惁鍙傛暟鏇存柊浜�
- bool enable = 9; //鏄惁鍚敤
- int32 sort = 10; //浠诲姟鎺掑簭
- bool is_full = 11;//鍙傛暟鏄惁璁剧疆瀹屾暣
- string link_task_id = 12;
-}
//鎽勫儚鏈哄竷闃茬殑鏃堕棿瑙勫垯锛屽彲浠ヨ缃涓�,鐢╥d鍏宠仈鍒板叿浣撶殑瑙勫垯閰嶇疆涓�
message CameraTimerule {
@@ -135,15 +92,9 @@
repeated Point points = 3;//鐐圭殑闆嗗悎
}
-message CameraTaskArgs {
+message CameraRules {
string camera_id = 1;
- repeated TaskGroupArgs task_args = 2;
-}
-
-message TaskGroupArgs {
- string task_id = 1;
- repeated GroupRule group_rules = 2;
- bool enable = 3;
+ repeated GroupRule rules = 2;
}
message GroupRule {
@@ -152,22 +103,44 @@
int32 alarm_level = 3;
repeated Rule rules = 4;
string set_type = 5;
- bool defence_state = 6;
+
+ string template_id = 6;
+ string template_rule = 7;
+ string time_rule_id = 8;
+ string scene_name = 9;
+ string desc = 10;
+ bool enable = 11;
}
message Rule {
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;
+ string camera_id =2;
+ string polygon_id =3;
+ string sdk_id = 4;
+ string sdk_arg_alias = 5;
+ string operator = 6;
+ string operator_type = 7;
+ string sdk_arg_value = 8;
+ int32 sort = 9;
+ string rule_with_pre = 10;
+ string group_id =11;
+}
+
+message RuleTemplate {
+ string id = 1;
+ string name = 2;
+ string desc = 3;
+ string txt = 4;
+ repeated TemplateArg rules = 5;
+}
+
+message TemplateArg {
+ string sdk_id = 1;
+ string sdk_arg_alias = 2;
+ string operator = 3;
+ string sdk_arg_value = 4;
+ string sort = 5;
+ string rule_with_pre = 6;
}
//Sdk struct
@@ -186,26 +159,6 @@
int32 del_flag = 12;//鏄惁鍒犻櫎
string iconBlob = 13; //鍥剧墖浜岃繘鍒�
string version = 14; //鐗堟湰
-}
-
-message TaskSdkRule {
- string taskId = 1;
- bool enable = 2;
- repeated SdkRuleSet sdkRules = 3;
-}
-
-message SdkRuleSet {
- string sdkId = 1;
- string ipcId = 2;
- repeated SdkRule rules = 3;
- int32 sort = 4;
-}
-
-message SdkRule {
- string id = 1;
- string sdk_arg_alias = 2;
- string operator = 3;
- string sdk_arg_value = 4;
}
//SdkArg struct
@@ -228,23 +181,21 @@
int32 minMovePos = 4;
}
+
+
//TableChanged enum
enum TableChanged {
T_Camera = 0;//鎽勫儚鏈哄彉鍖�
- T_CameraTask = 1;//鎽勫儚鏈轰换鍔″彉鍖�
- T_CameraTaskArgs = 2;//鎽勫儚鏈轰换鍔″弬鏁板彉鍖�
- T_Task = 3;//浠诲姟琛ㄥ彉鍖�
- T_TaskSdk = 4;//浠诲姟绠楁硶鍙樺寲
- T_TaskSdkRule = 5;//浠诲姟绠楁硶瑙勫垯鍙樺寲
- T_Sdk = 6;//sdk鍙樺寲
- T_CameraPolygon = 7;//鎽勫儚鏈哄杈瑰舰鍙樺寲
- T_TimeRule = 8;//鏃堕棿瑙勫垯鍙樺寲
- T_Server = 9;//鏈嶅姟鍣ㄤ俊鎭彉鍖�
- T_PollConfig = 10;//杞閰嶇疆鍙樺寲
- T_File = 11;//鏈湴鏂囦欢鍙樺寲
- T_FileSetting = 12;//鏈湴鏂囦欢鍒嗘瀽璁剧疆
- T_SdkChanSet = 13;//绠楁硶閫氶亾璁剧疆鍙樺寲
- T_FileStack = 14;//鏁版嵁鏍堝彉鍖�
+ T_CameraRule = 1;//鎽勫儚鏈轰换鍔″弬鏁板彉鍖�
+ T_Sdk = 2;//sdk鍙樺寲
+ T_CameraPolygon = 3;//鎽勫儚鏈哄杈瑰舰鍙樺寲
+ T_TimeRule = 4;//鏃堕棿瑙勫垯鍙樺寲
+ T_Server = 5;//鏈嶅姟鍣ㄤ俊鎭彉鍖�
+ T_PollConfig = 6;//杞閰嶇疆鍙樺寲
+ T_File = 7;//鏈湴鏂囦欢鍙樺寲
+ T_FileSetting = 8;//鏈湴鏂囦欢鍒嗘瀽璁剧疆
+ T_SdkChanSet = 9;//绠楁硶閫氶亾璁剧疆鍙樺寲
+ T_FileStack = 10;//鏁版嵁鏍堝彉鍖�
}
enum DbAction {
--
Gitblit v1.8.0