From 16255a4639f072ece37aaf141391960a6ce9c0bd Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 08 二月 2023 11:32:55 +0800
Subject: [PATCH] 修改提交的dataprocess.proto

---
 protomsg.proto |   76 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/protomsg.proto b/protomsg.proto
index 80c93e0..3efc3e0 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -41,6 +41,12 @@
     int32 fps = 23; //fps璁剧疆
 
     repeated Sensor sensors = 24; //浼犳劅鍣�
+
+    bool voiceEnable = 25;
+    string voiceId = 26;
+    string coordTransform = 27; //鍧愭爣杞崲淇℃伅
+
+    int32 status = 28;
 }
 
 message Sensor {
@@ -63,8 +69,10 @@
 message SdkRun {
     string ipc_id = 1;
     string sdk_type = 2;
-    bool isTriggerByPreSdk = 3;
+    int32 isTriggerByPreSdk = 3;
     int32 confidence = 4;
+    bool bReid = 5;
+    int32 triggerNextSdkType = 6;
 }
 
 
@@ -120,6 +128,7 @@
     string scene_name = 10;
     string desc = 11;
     bool enable = 12;
+    string voiceId = 13; //浜嬩欢澹伴煶
 }
 
 message GroupRuleSdks {
@@ -165,8 +174,9 @@
 message SdkSetBase {
     string sdk_arg_alias = 1;
     string operator = 2;
-    string sdk_arg_value = 3;
-    string sort = 4;
+    string operator_type = 3;
+    string sdk_arg_value = 4;
+    int32 sort = 5;
 }
 
 //Sdk struct
@@ -187,6 +197,9 @@
     string version = 14; //鐗堟湰
     bool enTrack = 15; //鏄惁寮�鍚窡韪�
     string argDef = 16; //榛樿鍙傛暟
+    string ruleSo = 17; //瑙勫垯鐢╯o
+    string iconBlob2 = 18; //绗簩濂楀浘鐗囦簩杩涘埗
+    string activateCode = 19; //
 }
 
 //SdkArg struct
@@ -224,6 +237,12 @@
     T_FileSetting = 8;//鏈湴鏂囦欢鍒嗘瀽璁剧疆
     T_SdkChanSet = 9;//绠楁硶閫氶亾璁剧疆鍙樺寲
     T_FileStack = 10;//鏁版嵁鏍堝彉鍖�
+    T_ResourceConfig = 11;//瀵瑰鏈嶅姟閰嶇疆鍙樺寲
+    T_CalculationPower = 12;//闇�瑕侀噸鏂拌绠楃畻鍔涘崰鐢ㄦ儏鍐�
+    T_EventPush = 13; //浜嬩欢鎺ㄩ�佹湁鍙樺寲
+    T_Cluster = 14; //闆嗙兢鍒涘缓銆佸姞鍏ユ垨閫�鍑�
+    T_CameraPolygonRelation = 15; //鎽勫儚鏈哄尯鍩熺殑鍏宠仈鍏崇郴
+    T_Voice = 16;//鎶ヨ澹伴煶鍙戠敓鍙樺寲
 }
 
 enum DbAction {
@@ -249,6 +268,15 @@
     string direction_line = 6;
     string type = 7;
     int32 defence_state = 8;
+    string camera_name = 9; //鎽勫儚鏈哄悕绉�
+}
+
+message CameraPolygonRelation {
+    string id = 1;
+    string source_camera_id = 2;
+    string source_polygon_id = 3;
+    string target_camera_id = 4;
+    string target_polygon_id = 5;
 }
 
 message VideotapeInfo {
@@ -285,6 +313,8 @@
     bool source = 11;
     string analyServerId = 12;
     string compareTarget = 13;//姣斿鐨勭洰鏍�
+    bool isCompareAll = 14; //鏄惁姣斿鍏ㄩ儴,鍋氭祴璇曠敤
+    repeated string serverIds = 15; //绠＄悊骞冲彴姣斿澶氫釜璁惧浜х敓鐨勬暟鎹�
 }
 
 message CompareEvent {
@@ -321,6 +351,16 @@
     repeated PushIpPort ip_ports = 10;
     repeated PushUrl urls = 11;
     repeated EventPushRule rules = 12;
+    map<string,string> filtRename = 13;
+    repeated PushSetMenu push_set = 14;
+}
+
+message PushSetMenu {
+    string id = 1;
+    string name = 2;
+    bool checked = 3;
+    string alias = 4;
+    repeated PushSetMenu children = 5;
 }
 
 message EventPushRule {
@@ -367,3 +407,33 @@
     int32 enable = 6;
     string carNo = 7;
 }
+
+message ClusterAndNodes {
+    string clusterId = 1;
+    string clusterName = 2;
+    repeated Node nodes = 3;
+    string virtualIp = 4;
+    string password = 5;
+}
+
+message Node {
+    string id = 1;
+    string cluster_id=2;
+    string node_name = 3;
+    string node_id = 4;
+    string node_ip = 5;
+    string create_time = 6;
+    bool isDelete = 7;
+    string drift_state = 8;
+    string device_type = 9;
+}
+
+message Dic {
+    string id = 1;
+    string value = 2;
+    string name = 3;
+    string type = 4;
+    string description = 5;
+    int32 sort = 6;
+    string parent_id = 7;
+}
\ No newline at end of file

--
Gitblit v1.8.0