From dc8ca60fc53199251100883b4370de52a6534463 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 22 八月 2019 14:01:53 +0800
Subject: [PATCH] soinfo id change to string
---
protomsg.proto | 329 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 229 insertions(+), 100 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index 07ce24d..99cdcc3 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -1,24 +1,9 @@
syntax = "proto3";
+
package protomsg;
-message TaskLabel {
- string taskid = 1;
- repeated string sdkids = 2;
- int32 index = 3 ;
-}
+import "base.proto";
-message SdkMessage {
- string cid = 1;
- TaskLabel tasklab = 2;
- bytes data =3 ;
-}
-
-// Image ipc struct
-message Image{
- int32 width = 1;
- int32 height = 2;
- bytes data = 3;
-}
//Area缁撴瀯浣�
message Area{
@@ -31,18 +16,32 @@
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;
+ string alias = 3;
+ string snapshot_url = 4;//鎽勫儚鏈哄簳鍥惧揩鐓�
+ int32 type = 5;
+ string addr = 6;
+ int32 areaid = 7;
+ float longitude = 8;
+ float latitude = 9;
+ string rtsp = 10;
+ string ip = 11;
+ int32 port = 12;
+ string username = 13;
+ string password = 14;
+ string brand = 15;
+ string reserved = 16;
+
+ bool is_running = 17;//鏄惁姝ｅ湪鍋氫换鍔★紙0:鍚︼紝1锛氭槸锛�
+ bool run_enable = 18;//鏄惁鍚敤瀹炴椂鎴栬疆璇�(0:鍚︼紝1锛氭槸)
+ int32 run_type = 19;//鍋氫换鍔＄殑绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃讹級
+ string run_server_id = 20;//褰撳墠姝ｅ湪鍝彴鏈嶅姟鍣ㄤ笂鍋氫换鍔�
+
+}
+
+//鎽勫儚鏈虹殑浠诲姟淇℃伅
+message CameraAndTaskInfo {
+ Camera camera = 1;//鎽勫儚鏈轰俊鎭�
+ repeated Task tasks = 2;//浠诲姟鍒楄〃
}
//Task缁撴瀯浣�
@@ -57,12 +56,27 @@
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_ids = 2;//鎽勫儚鏈篿d
+ string camera_id = 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; //閫昏緫鍒犻櫎鏍囪
@@ -70,7 +84,14 @@
bool enable = 9; //鏄惁鍚敤
int32 sort = 10; //浠诲姟鎺掑簭
bool is_full = 11;//鍙傛暟鏄惁璁剧疆瀹屾暣
- string link_group_id = 12;
+ string link_task_id = 12;
+}
+
+//鎽勫儚鏈哄竷闃茬殑鏃堕棿瑙勫垯锛屽彲浠ヨ缃涓�,鐢╥d鍏宠仈鍒板叿浣撶殑瑙勫垯閰嶇疆涓�
+message CameraTimerule {
+ string id = 1;//id
+ string name = 2;//瑙勫垯鍚嶇О
+ string time_rule = 3;//鍏蜂綋鏃堕棿瑙勫垯璁剧疆
}
//DayCtl struct 姣忓ぉ鐨勬椂闂存帶鍒惰鍒�
@@ -89,10 +110,30 @@
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;
+ bool enable = 3;
+}
+
+message GroupRule {
+ string group_id = 1;
+ string group_text = 2;
+ int32 alarm_level = 3;
+ repeated Rule rules = 4;
+ string set_type = 5;
+ bool defence_state = 6;
+}
+
+message Rule {
string id =1;
string camera_task_id =2;
string camera_id =3;
@@ -103,92 +144,180 @@
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 ipc_id = 2;
+ string sdk_type = 3;//绠楁硶绫诲瀷
+ string sdk_name = 4;//sdk鍚嶇О
+ repeated SdkArg args = 5;//绠楁硶鍙傛暟
+ string icon = 6;//绠楁硶鍥炬爣
+ string url = 7;//绠楁硶涓嬭浇鍦板潃
+ string create_time = 8;
+ string update_time = 9;
+ string create_by = 10;
+ bool enable = 11;//鏄惁鍚敤
+ int32 del_flag = 12;//鏄惁鍒犻櫎
+}
+
+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
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;//鍙傛暟鎺掑簭
+ string default_value = 7;//鍙傛暟榛樿鍊�
+ string default_operator = 8;//鍙傛暟榛樿璁＄畻绗﹀彿
+ int32 sort = 9;//鍙傛暟鎺掑簭
}
-// struct for sdk
-message Point{
- int32 x = 1;
- int32 y = 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鍙樺寲
+ T_CameraPolygon = 7;//鎽勫儚鏈哄杈瑰舰鍙樺寲
+ T_TimeRule = 8;//鏃堕棿瑙勫垯鍙樺寲
+ T_Server = 9;//鏈嶅姟鍣ㄤ俊鎭彉鍖�
+ T_PollConfig = 10;//杞閰嶇疆鍙樺寲
}
-message Rect{
- int32 left = 1;
- int32 top = 2;
- int32 right = 3;
- int32 bottom = 4;
+
+enum DbAction {
+ Insert = 0;//Insert
+ Update = 1;//Update
+ Delete = 2;//Delete
}
-message FaceAngle{
- int32 yaw = 1;
- int32 pitch =2;
- int32 roll = 3;
- float confidence =4;
+
+//publish db change message
+message DbChangeMessage {
+ TableChanged table = 1;//鍙樺寲鐨勮〃
+ string id = 2;//鍙樺寲鏁版嵁id
+ DbAction action = 3;//action
+ string info = 4;//鍙樺寲鍐呭
}
-message ThftResult{
- int32 gender = 1;
- int32 age = 2;
- int32 race = 3;
- int32 beauty = 4;
- int32 smile = 5;
+
+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;
}
-message FacePos{
- Rect rcFace = 1;
- Point ptLeftEye = 2;
- Point ptRightEye = 3;
- Point ptMouth = 4;
- Point ptNose = 5;
- FaceAngle fAngle = 6;
- int32 quality = 7;
- bytes facialData = 8;
+
+message VideotapeInfo {
+ string esDataId = 1;
+ string cameraId = 2;
+ string taskId = 3;
+ int64 imgId = 4;
+ repeated string sdkIds = 5;
+ int32 type = 6;
}
-message FaceInfo{
- Rect rcFace = 1;
- Point ptLeftEye = 2;
- Point ptRightEye = 3;
- Point ptMouth = 4;
- Point ptNose = 5;
- FaceAngle fAngle = 6;
- int32 quality = 7;
- bytes facialData = 8;
- int64 faceID = 9;
+
+message CompareArgs {
+ repeated string tableIds = 1;
+ float compareThreshold = 2;
+ bytes faceFeature = 3;
+
+ repeated string tasks = 4;
+ repeated string treeNodes = 5;
+ repeated string tabs = 6;
+ repeated string alarmLevel = 7;
+ repeated string searchTime = 8;
+ string inputValue = 9;
+ string collection = 10;
+ bool source = 11;
+ string analyServerId = 12;
}
-message ObjInfo{
- Rect rcObj = 1;
- int32 typ = 2;
- float prob = 3;
+
+message SdkCompareEach {
+ string id = 1;
+ string tableid = 2;
+ float compareScore = 3;
}
-// sdk face property
-message ParamFaceProperty{
- FacePos pos = 1;
- Image img = 2;
+
+message SdkCompareResult {
+ repeated SdkCompareEach compareResult = 1;
}
-// sdk face extract
-message ParamFaceCompare{
- bytes feat1 = 1;
- bytes feat2 = 2;
+
+message EventPush {
+ string id = 1;
+ string name = 2;
+ string time_start = 3;
+ string time_end = 4;
+ bool is_satisfy_all = 5;
+ string rule_text = 6;
+ bool enable = 7;
+ string link_type = 8;
+ string link_device = 9;
+ repeated PushIpPort ip_ports = 10;
+ repeated PushUrl urls = 11;
+ repeated EventPushRule rules = 12;
+}
+
+message EventPushRule {
+ string id = 1;
+ string topic_type = 2;
+ string topic_arg = 3;
+ string operator = 4;
+ string operator_type = 5;
+ string rule_value = 6;
+ string event_push_id = 7;
+}
+
+message PushIpPort {
+ string server_ip = 1;
+ int32 port = 2;
+ bool enable = 3;
+}
+
+message PushUrl {
+ string url = 1;
+ bool enable = 2;
+}
+
+enum EsCacheChanged {
+ T_DbTable = 0;//搴曞簱鏈夋晥鐘舵�佸彉鍖�
+ T_DbTablePerson = 1;//搴曞簱浜哄憳鏈夋晥鐘舵�佸彉鍖�
+}
+
+message EsPersonCacheChange {
+ EsCacheChanged type = 1;
+ repeated string table_id = 2;//搴曞簱id
+ string person_id = 3;//浜哄憳id
+ string feature = 4;//鐗瑰緛鍊糱ase64
+ DbAction action = 5;
+ int32 enable = 6;
}
--
Gitblit v1.8.0