From 19aa932d862868db661856d03de8a7845ae20f30 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 14 七月 2020 11:27:39 +0800
Subject: [PATCH] sdk add ruleSo
---
protomsg.proto | 269 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 163 insertions(+), 106 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index a3a8d66..ec47464 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -20,9 +20,9 @@
string snapshot_url = 4;//鎽勫儚鏈哄簳鍥惧揩鐓�
int32 type = 5;
string addr = 6;
- int32 areaid = 7;
- float longitude = 8;
- float latitude = 9;
+ float longitude = 7;
+ float latitude = 8;
+ int32 floor = 9;
string rtsp = 10;
string ip = 11;
int32 port = 12;
@@ -36,56 +36,37 @@
int32 run_type = 19;//鍋氫换鍔＄殑绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃讹級
string run_server_id = 20;//褰撳墠姝ｅ湪鍝彴鏈嶅姟鍣ㄤ笂鍋氫换鍔�
+ int32 resolution_width = 21; //鍒嗚鲸鐜囧
+ int32 resolution_height = 22; //鍒嗚鲸鐜囬珮
+ int32 fps = 23; //fps璁剧疆
+
+ repeated Sensor sensors = 24; //浼犳劅鍣�
}
-//鎽勫儚鏈虹殑浠诲姟淇℃伅
-message CameraAndTaskInfo {
- Camera camera = 1;//鎽勫儚鏈轰俊鎭�
- repeated Task tasks = 2;//浠诲姟鍒楄〃
+message Sensor {
+ string id = 1;
+ string type = 2;
+ string ip = 3;
+ int32 port = 4;
+ string username = 5;
+ string password = 6;
+ int32 threshold = 7;
+ bool enable = 8;
}
-//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 CameraLink {
+ string camera_ids = 1;
+ string link_task_id = 2;
}
message SdkRun {
string ipc_id = 1;
string sdk_type = 2;
+ bool isTriggerByPreSdk = 3;
+ int32 confidence = 4;
}
-message TaskSdkRun {
- Task task = 1;
- repeated SdkRun sdks = 2;
-}
-
-//鎽勫儚鏈轰换鍔�
-message CameraTask {
- string id = 1;
- string camera_id = 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_task_id = 12;
-}
//鎽勫儚鏈哄竷闃茬殑鏃堕棿瑙勫垯锛屽彲浠ヨ缃涓�,鐢╥d鍏宠仈鍒板叿浣撶殑瑙勫垯閰嶇疆涓�
message CameraTimerule {
@@ -113,39 +94,80 @@
repeated Point points = 3;//鐐圭殑闆嗗悎
}
-message CameraTaskArgs {
- string camera_id = 1;
- repeated TaskGroupArgs task_args = 2;
+message CameraInfo {
+ string runServerName = 1;
+ string id = 2;
+ string name = 3;
+ int32 run_type= 4;
}
-
-message TaskGroupArgs {
- string task_id = 1;
- repeated GroupRule group_rules = 2;
- bool enable = 3;
+message CameraAndRules {
+ CameraInfo cameraInfo = 1;
+ repeated GroupRule rules = 2;
}
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;
+ repeated string cameraIds = 1;
+ string id = 2;
+
+ string group_text = 3;
+ int32 alarm_level = 4;
+ repeated Rule rules = 5;
+ string set_type = 6;
+
+ string template_id = 7;
+ string template_rule = 8;
+ string time_rule_id = 9;
+ string scene_name = 10;
+ string desc = 11;
+ bool enable = 12;
+}
+
+message GroupRuleSdks {
+ string id = 1;
+ string scene_name = 2;
+ repeated SdkRun sdks = 3;
+ repeated string sdkIds = 4;
}
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;
+ repeated SdkSetBase sdk_set = 5;
+ string rule_with_pre = 6;
+ bool is_save_anyhow = 7; //rule_with_pre鏄Е鍙戞椂锛屾槸鍚︽棤璁鸿瑙﹀彂鐨勬潯浠舵弧涓嶆弧瓒筹紝閮戒繚鐣欐暟鎹�
+ string group_id =8;
+ int32 sort = 9;
+}
+
+message RuleTemplate {
+ string id = 1;
+ string name = 2;
+ string desc = 3;
+ string txt = 4;
+ repeated TemplateArg rules = 5;
+}
+
+message RuleTemplateList {
+ repeated RuleTemplate list = 1;
+}
+
+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;
+}
+
+message SdkSetBase {
+ string sdk_arg_alias = 1;
+ string operator = 2;
+ string operator_type = 3;
+ string sdk_arg_value = 4;
+ int32 sort = 5;
}
//Sdk struct
@@ -162,26 +184,11 @@
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;
+ string iconBlob = 13; //鍥剧墖浜岃繘鍒�
+ string version = 14; //鐗堟湰
+ bool enTrack = 15; //鏄惁寮�鍚窡韪�
+ string argDef = 16; //榛樿鍙傛暟
+ string ruleSo = 17; //瑙勫垯鐢╯o
}
//SdkArg struct
@@ -192,22 +199,33 @@
bool must = 4;//鍙傛暟鏄惁蹇呭～
string unit = 5;//鍗曚綅
string range = 6;//鍙傛暟鐨勮寖鍥�
- int32 sort = 7;//鍙傛暟鎺掑簭
+ string default_value = 7;//鍙傛暟榛樿鍊�
+ string default_operator = 8;//鍙傛暟榛樿璁＄畻绗﹀彿
+ int32 sort = 9;//鍙傛暟鎺掑簭
}
+
+message SdkChanSet {
+ string sdk_type = 1;
+ int32 chan_num = 2;
+ int32 confidenceInc = 3;
+ 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_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 {
@@ -240,24 +258,46 @@
string cameraId = 2;
string taskId = 3;
int64 imgId = 4;
- repeated string sdkIds = 5;
- int32 type = 6;
+ string videoUrl = 5;
+ repeated string sdkIds = 6;
+ int32 type = 7;
+}
+
+message Voice {
+ string id = 1;
+ string name = 2;
+ string path = 3;
+}
+
+message VoiceList {
+ repeated Voice list = 1;
}
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;
+ string alarmLevel = 7;
repeated string searchTime = 8;
string inputValue = 9;
string collection = 10;
bool source = 11;
string analyServerId = 12;
+ string compareTarget = 13;//姣斿鐨勭洰鏍�
+}
+
+message CompareEvent {
+ CompareEventType eventType =1;
+ bytes payload = 2;
+}
+
+enum CompareEventType {
+ ReInitCache = 0; // 閲嶆柊鍒濆鍖栧簳搴撶紦瀛橈紙鍔犲叆闆嗙兢鍚庢墽琛岋級
+ UpdateCache = 1; // 鏇存柊搴曞簱鍜屼汉鍛樼紦瀛�
+ Compare = 2; // 鍋氭瘮瀵硅姹�
}
message SdkCompareEach {
@@ -306,9 +346,26 @@
bool enable = 2;
}
+message PushAttach {
+ string push_id = 1;
+ Camera cam = 2;
+ string server_id = 3;
+ string server_name = 4;
+ string local_ip = 5;
+ string video_url = 6;
+}
+
+enum EsCacheChanged {
+ T_DbTable = 0;//搴曞簱鏈夋晥鐘舵�佸彉鍖�
+ T_DbTablePerson = 1;//搴曞簱浜哄憳鏈夋晥鐘舵�佸彉鍖�
+}
+
message EsPersonCacheChange {
- string table_id = 1;//搴曞簱id
- string person_id = 2;//浜哄憳id
- bytes feature = 3;//鐗瑰緛鍊�
- DbAction action = 4;
+ EsCacheChanged type = 1;
+ repeated string table_id = 2;//搴曞簱id
+ string person_id = 3;//浜哄憳id
+ string feature = 4;//鐗瑰緛鍊糱ase64
+ DbAction action = 5;
+ int32 enable = 6;
+ string carNo = 7;
}
--
Gitblit v1.8.0