From 675c5351b004b77844b02f7d023c60598276e01c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期日, 16 六月 2019 14:23:19 +0800
Subject: [PATCH] fix sdk.enabled type to bool
---
protomsg.proto | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 100 insertions(+), 18 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index 07ce24d..ad64dca 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -7,6 +7,7 @@
int32 index = 3 ;
}
+//SdkMessage struct test
message SdkMessage {
string cid = 1;
TaskLabel tasklab = 2;
@@ -45,6 +46,12 @@
string reserved = 14;
}
+//鎽勫儚鏈虹殑浠诲姟淇℃伅
+message CameraAndTaskInfo {
+ Camera camera = 1;//鎽勫儚鏈轰俊鎭�
+ repeated Task tasks = 2;//浠诲姟鍒楄〃
+}
+
//Task缁撴瀯浣�
message Task {
string taskid = 1;
@@ -57,12 +64,17 @@
bool del_flag = 8;
}
+message TaskSdkInfo {
+ Task task = 1;
+ repeated Sdk sdks = 2;
+}
+
//鎽勫儚鏈轰换鍔�
message CameraTask {
string id = 1;
string camera_ids = 2;//鎽勫儚鏈篿d
string task_id = 3;//浠诲姟id
- string time_rule = 4;//甯冮槻鏃堕棿
+ repeated DayCtl time_rule = 4;//甯冮槻鏃堕棿
string react_rule = 5;//鑱斿姩鏂瑰紡
string react_device = 6;//鑱斿姩璁惧
bool del_flag = 7; //閫昏緫鍒犻櫎鏍囪
@@ -71,6 +83,13 @@
int32 sort = 10; //浠诲姟鎺掑簭
bool is_full = 11;//鍙傛暟鏄惁璁剧疆瀹屾暣
string link_group_id = 12;
+}
+
+//鎽勫儚鏈哄竷闃茬殑鏃堕棿瑙勫垯锛屽彲浠ヨ缃涓�,鐢╥d鍏宠仈鍒板叿浣撶殑瑙勫垯閰嶇疆涓�
+message CameraTimerule {
+ string id = 1;//id
+ string name = 2;//瑙勫垯鍚嶇О
+ string time_rule = 3;//鍏蜂綋鏃堕棿瑙勫垯璁剧疆
}
//DayCtl struct 姣忓ぉ鐨勬椂闂存帶鍒惰鍒�
@@ -89,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 Rule rules = 2;
+}
+
+message Rule {
string id =1;
string camera_task_id =2;
string camera_id =3;
@@ -103,31 +137,32 @@
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
message Sdk {
string id = 1;
- string create_time = 2;
- string update_time = 3;
- string create_by = 4;
- string del_flag = 5;//鏄惁鍒犻櫎
- string enabled = 6;//鏄惁鍚敤
- string sdk_name = 7;//sdk鍚嶇О
- string icon = 8;//绠楁硶鍥炬爣
- string url = 9;//绠楁硶涓嬭浇鍦板潃
- string args = 10;//绠楁硶鍙傛暟json锛屾帴鏀跺埌鍚庝互[]SdkArg瑙ｆ瀽
+ string sdk_type = 2;//绠楁硶绫诲瀷
+ string sdk_name = 3;//sdk鍚嶇О
+ repeated SdkArg args = 4;//绠楁硶鍙傛暟
+ string icon = 5;//绠楁硶鍥炬爣
+ string url = 6;//绠楁硶涓嬭浇鍦板潃
+ string create_time = 7;
+ string update_time = 8;
+ string create_by = 9;
+ bool enabled = 10;//鏄惁鍚敤
+ int32 del_flag = 11;//鏄惁鍒犻櫎
}
//SdkArg struct
message SdkArg {
- string alias = 2;//鍙傛暟鍒悕
- string name = 3;//鍙傛暟鍚嶇О
- string type = 4;//鍙傛暟绫诲瀷
- bool must = 5;//鍙傛暟鏄惁蹇呭～
+ string alias = 1;//鍙傛暟鍒悕
+ string name = 2;//鍙傛暟鍚嶇О
+ string type = 3;//鍙傛暟绫诲瀷
+ bool must = 4;//鍙傛暟鏄惁蹇呭～
+ string unit = 5;//鍗曚綅
string range = 6;//鍙傛暟鐨勮寖鍥�
int32 sort = 7;//鍙傛暟鎺掑簭
}
@@ -182,8 +217,9 @@
int32 typ = 2;
float prob = 3;
}
+
// sdk face property
-message ParamFaceProperty{
+message ParamFacePos{
FacePos pos = 1;
Image img = 2;
}
@@ -192,3 +228,49 @@
bytes feat1 = 1;
bytes feat2 = 2;
}
+// sdk face property
+message ParamFaceProperty{
+ ThftResult result = 1;
+ Image img = 2;
+}
+// sdk yolo detect
+message ParamYoloObj{
+ repeated ObjInfo infos = 1;
+ Image img = 2;
+}
+
+//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鍙樺寲
+}
+
+enum DbAction {
+ Insert = 0;//Insert
+ Update = 1;//Update
+ Delete = 2;//Delete
+}
+
+//publish db change message
+message DbChangeMessage {
+ TableChanged table = 1;//鍙樺寲鐨勮〃
+ string id = 2;//鍙樺寲鏁版嵁id
+ DbAction action = 3;//action
+ string info = 4;//鍙樺寲鍐呭
+}
+
+message CameraPolygon {
+ string id = 1;
+ string camera_id = 2;//鎽勫儚鏈篿d
+ string name = 3;//鍚嶇О
+ string polygon = 4;//鍧愭爣鐐归泦鍚�
+ string trigger_line = 5;
+ string direction_line = 6;
+ string type = 7;
+ int32 defence_state = 8;
+}
\ No newline at end of file
--
Gitblit v1.8.0