From abd6d2381b39009f8bd9faf47ddf4535a1596fdc Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 04 十二月 2019 13:24:47 +0800
Subject: [PATCH] add pollChannelCount to PollConfig
---
protomsg.proto | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index 3bf9aa1..bf5d294 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;
@@ -164,6 +164,26 @@
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 = 1;//鍙傛暟鍒悕
@@ -172,7 +192,9 @@
bool must = 4;//鍙傛暟鏄惁蹇呭～
string unit = 5;//鍗曚綅
string range = 6;//鍙傛暟鐨勮寖鍥�
- int32 sort = 7;//鍙傛暟鎺掑簭
+ string default_value = 7;//鍙傛暟榛樿鍊�
+ string default_operator = 8;//鍙傛暟榛樿璁＄畻绗﹀彿
+ int32 sort = 9;//鍙傛暟鎺掑簭
}
//TableChanged enum
@@ -188,6 +210,8 @@
T_TimeRule = 8;//鏃堕棿瑙勫垯鍙樺寲
T_Server = 9;//鏈嶅姟鍣ㄤ俊鎭彉鍖�
T_PollConfig = 10;//杞閰嶇疆鍙樺寲
+ T_File = 11;//鏈湴鏂囦欢鍙樺寲
+ T_FileSetting = 12;//鏈湴鏂囦欢鍒嗘瀽璁剧疆
}
enum DbAction {
@@ -220,22 +244,45 @@
string cameraId = 2;
string taskId = 3;
int64 imgId = 4;
- repeated string sdkIds = 5;
+ string videoUrl = 5;
+ repeated string sdkIds = 6;
+ int32 type = 7;
}
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;
+}
+
+message CompareEvent {
+ CompareEventType eventType =1;
+ bytes payload = 2;
+}
+
+enum CompareEventType {
+ ReInitCache = 0; // 閲嶆柊鍒濆鍖栧簳搴撶紦瀛橈紙鍔犲叆闆嗙兢鍚庢墽琛岋級
+ UpdateCache = 1; // 鏇存柊搴曞簱鍜屼汉鍛樼紦瀛�
+ Compare = 2; // 鍋氭瘮瀵硅姹�
+}
+
+message SdkCompareEach {
+ string id = 1;
+ string tableid = 2;
+ float compareScore = 3;
+}
+
+message SdkCompareResult {
+ repeated SdkCompareEach compareResult = 1;
}
message EventPush {
@@ -274,9 +321,25 @@
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;
}
--
Gitblit v1.8.0