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 | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 203 insertions(+), 0 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index 98e0b74..38ec79c 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;
@@ -18,6 +19,151 @@
int32 width = 1;
int32 height = 2;
bytes data = 3;
+}
+
+//Area缁撴瀯浣�
+message Area{
+ int32 id = 1;
+ int32 parentid = 2;
+ string name = 3;
+}
+
+//Camera缁撴瀯浣�
+message Camera {
+ string id = 1;
+ string name = 2;
+ int32 type = 3;
+ string addr = 4;
+ int32 areaid = 5;
+ float longitude = 6;
+ float latitude = 7;
+ string rtsp = 8;
+ string ip = 9;
+ int32 port = 10;
+ string username = 11;
+ string password = 12;
+ string brand = 13;
+ string reserved = 14;
+}
+
+//鎽勫儚鏈虹殑浠诲姟淇℃伅
+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 CameraTask {
+ string id = 1;
+ string camera_ids = 2;//鎽勫儚鏈篿d
+ string task_id = 3;//浠诲姟id
+ repeated DayCtl 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_group_id = 12;
+}
+
+//鎽勫儚鏈哄竷闃茬殑鏃堕棿瑙勫垯锛屽彲浠ヨ缃涓�,鐢╥d鍏宠仈鍒板叿浣撶殑瑙勫垯閰嶇疆涓�
+message CameraTimerule {
+ string id = 1;//id
+ string name = 2;//瑙勫垯鍚嶇О
+ string time_rule = 3;//鍏蜂綋鏃堕棿瑙勫垯璁剧疆
+}
+
+//DayCtl struct 姣忓ぉ鐨勬椂闂存帶鍒惰鍒�
+message DayCtl {
+ int32 day = 1;//1-7琛ㄧず鏄熸湡涓�鍒版槦鏈熸棩
+ repeated TimeRange time_range = 2;
+}
+
+//鏃堕棿璧峰鑼冨洿
+message TimeRange {
+ string start = 1;//寮�濮�
+ string end = 2;//缁撴潫
+}
+
+//Polygon struct
+message Polygon {
+ string id = 1;//褰㈢姸id
+ string name = 2;//褰㈢姸鐨勫悕绉�
+ 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;
+ 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;
+}
+
+//Sdk struct
+message Sdk {
+ string id = 1;
+ 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;
+ string enabled = 10;//鏄惁鍚敤
+ string del_flag = 11;//鏄惁鍒犻櫎
+}
+
+//SdkArg struct
+message SdkArg {
+ string alias = 2;//鍙傛暟鍒悕
+ string name = 3;//鍙傛暟鍚嶇О
+ string type = 4;//鍙傛暟绫诲瀷
+ bool must = 5;//鍙傛暟鏄惁蹇呭～
+ string range = 6;//鍙傛暟鐨勮寖鍥�
+ int32 sort = 7;//鍙傛暟鎺掑簭
}
// struct for sdk
@@ -70,3 +216,60 @@
int32 typ = 2;
float prob = 3;
}
+
+// sdk face property
+message ParamFacePos{
+ FacePos pos = 1;
+ Image img = 2;
+}
+// sdk face extract
+message ParamFaceCompare{
+ 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