From 80ae7958a17a492098f18f31fa21804f37b6cbaa Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期三, 08 五月 2024 14:52:55 +0800 Subject: [PATCH] 更新dataprocess.pb --- protomsg.proto | 74 ++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 2 deletions(-) diff --git a/protomsg.proto b/protomsg.proto index 1b35f22..fb0972f 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 { @@ -167,7 +176,7 @@ string operator = 2; string operator_type = 3; string sdk_arg_value = 4; - string sort = 5; + int32 sort = 5; } //Sdk struct @@ -188,6 +197,9 @@ string version = 14; //鐗堟湰 bool enTrack = 15; //鏄惁寮�鍚窡韪� string argDef = 16; //榛樿鍙傛暟 + string ruleSo = 17; //瑙勫垯鐢╯o + string iconBlob2 = 18; //绗簩濂楀浘鐗囦簩杩涘埗 + string activateCode = 19; // } //SdkArg struct @@ -225,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 { @@ -250,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 { @@ -286,6 +313,8 @@ bool source = 11; string analyServerId = 12; string compareTarget = 13;//姣斿鐨勭洰鏍� + bool isCompareAll = 14; //鏄惁姣斿鍏ㄩ儴,鍋氭祴璇曠敤 + repeated string serverIds = 15; //绠$悊骞冲彴姣斿澶氫釜璁惧浜х敓鐨勬暟鎹� } message CompareEvent { @@ -297,6 +326,7 @@ ReInitCache = 0; // 閲嶆柊鍒濆鍖栧簳搴撶紦瀛橈紙鍔犲叆闆嗙兢鍚庢墽琛岋級 UpdateCache = 1; // 鏇存柊搴曞簱鍜屼汉鍛樼紦瀛� Compare = 2; // 鍋氭瘮瀵硅姹� + DeleteCache = 3; // 鍒犻櫎缂撳瓨 } message SdkCompareEach { @@ -322,6 +352,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 { @@ -368,3 +408,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; +} -- Gitblit v1.8.0