From dff6e09c415988cc0b5c558013822548ffab254e Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 19 十一月 2019 20:19:03 +0800
Subject: [PATCH] change float to double

---
 protomsg.proto |  133 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 126 insertions(+), 7 deletions(-)

diff --git a/protomsg.proto b/protomsg.proto
index bd3dc9b..8c4b6e9 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
-import "base.proto";
 
 package protomsg;
 
+import "base.proto";
 
 
 //Area缁撴瀯浣�
@@ -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
@@ -220,5 +242,102 @@
     string cameraId = 2;
     string taskId = 3;
     int64 imgId = 4;
-    repeated string sdkIds = 5;
-}
\ No newline at end of file
+    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 int32 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 {
+    string id = 1;
+    string name = 2;
+    string time_start = 3;
+    string time_end = 4;
+    bool is_satisfy_all = 5;
+    string rule_text = 6;
+    bool enable = 7;
+    string link_type = 8;
+    string link_device = 9;
+    repeated PushIpPort ip_ports = 10;
+    repeated PushUrl urls = 11;
+    repeated EventPushRule rules = 12;
+}
+
+message EventPushRule {
+    string id = 1;
+    string topic_type = 2;
+    string topic_arg = 3;
+    string operator = 4;
+    string operator_type = 5;
+    string rule_value = 6;
+    string event_push_id = 7;
+}
+
+message PushIpPort {
+    string server_ip = 1;
+    int32 port = 2;
+    bool enable = 3;
+}
+
+message PushUrl {
+    string url = 1;
+    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 {
+    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