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 | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index 08f251f..3efc3e0 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -44,6 +44,9 @@
bool voiceEnable = 25;
string voiceId = 26;
+ string coordTransform = 27; //鍧愭爣杞崲淇℃伅
+
+ int32 status = 28;
}
message Sensor {
@@ -66,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;
}
@@ -123,6 +128,7 @@
string scene_name = 10;
string desc = 11;
bool enable = 12;
+ string voiceId = 13; //浜嬩欢澹伴煶
}
message GroupRuleSdks {
@@ -192,6 +198,8 @@
bool enTrack = 15; //鏄惁寮�鍚窡韪�
string argDef = 16; //榛樿鍙傛暟
string ruleSo = 17; //瑙勫垯鐢╯o
+ string iconBlob2 = 18; //绗簩濂楀浘鐗囦簩杩涘埗
+ string activateCode = 19; //
}
//SdkArg struct
@@ -232,6 +240,9 @@
T_ResourceConfig = 11;//瀵瑰鏈嶅姟閰嶇疆鍙樺寲
T_CalculationPower = 12;//闇�瑕侀噸鏂拌绠楃畻鍔涘崰鐢ㄦ儏鍐�
T_EventPush = 13; //浜嬩欢鎺ㄩ�佹湁鍙樺寲
+ T_Cluster = 14; //闆嗙兢鍒涘缓銆佸姞鍏ユ垨閫�鍑�
+ T_CameraPolygonRelation = 15; //鎽勫儚鏈哄尯鍩熺殑鍏宠仈鍏崇郴
+ T_Voice = 16;//鎶ヨ澹伴煶鍙戠敓鍙樺寲
}
enum DbAction {
@@ -258,6 +269,14 @@
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 {
@@ -295,6 +314,7 @@
string analyServerId = 12;
string compareTarget = 13;//姣斿鐨勭洰鏍�
bool isCompareAll = 14; //鏄惁姣斿鍏ㄩ儴,鍋氭祴璇曠敤
+ repeated string serverIds = 15; //绠$悊骞冲彴姣斿澶氫釜璁惧浜х敓鐨勬暟鎹�
}
message CompareEvent {
@@ -331,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 {
@@ -382,6 +412,8 @@
string clusterId = 1;
string clusterName = 2;
repeated Node nodes = 3;
+ string virtualIp = 4;
+ string password = 5;
}
message Node {
@@ -392,4 +424,16 @@
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