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 | 373 +++++++++++++++++++++++++----------------------------
1 files changed, 175 insertions(+), 198 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index a1f8037..8c4b6e9 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -2,108 +2,7 @@
package protomsg;
-message TaskLabel {
- string taskid = 1;
- repeated string sdkids = 2;
- int32 index = 3 ;
-}
-
-//SdkMessage struct test
-message SdkMessage {
- string cid = 1;
- TaskLabel tasklab = 2;
- bytes data =3 ;
-
- Personaction personaction =4;
- Vediopersons vedioperson = 5;
-}
-
-message Personaction{
- string imgKey = 1;
- string videoReqNum = 2;
- string sdkType = 3;
- string picName = 4;
- string content = 5;
- string cluster_id = 6;
- string personPicUrl = 7;
- string channlId = 8;
- string likeDate = 9;
-
- string picAddress = 10;
- string picMaxUrl = 11;
- string picDate = 12;
- string picLocalUrl = 13;
- string isDelete = 14;
- string likePer = 15;
- string baseName = 16;
- string videoNum = 17;
- string collection = 18;
- string picSmUrl = 19;
-
- string indeviceid = 20;
- string idcard = 21;
- string ack_alarm = 22;
- string personId = 23;
- string id = 24;
- string indevicename = 25;
- string faceFeature = 26;
- string personIsHub = 27;
- string videoIp = 28;
- string taskId = 29;
-}
-
-message PersonBaseInfo {
- string personNamae = 1;
- string iDCard = 2;
- string gender = 3;
- string personPicUrl = 4;
- string likePer = 5;
- string tableId = 6;
- string monitorLevel = 7;
- string personId = 8;
- string phoneNum = 9;
- string content = 10;
- string tableName = 11;
-}
-
-message Vediopersons {
- string iD = 1;
- string videoReqNum = 2;
- string sdkType=3;
- string gender=4;
- string picName=5;
- string content=6;
- string personPicUrl=7;
- string channlId=8;
- string likeDate=9;
- string race=10;
- string pciAddress=11;
- string picMaxUrl=12;
- string age=13;
- string picDate=14;
- string picLocalUrl=15;
- string isDelete=16;
- repeated string tableName=17;
- string videoNum=18;
- string picSmUrl=19;
- string simleLevel=20;
- string indeviceId=21;
- repeated string iDcard=22;
- repeated string personId=23;
- string beautyLevel=24;
- string indeviceName=25;
- string faceFeature=26;
- string personIsHub=27;
- string videoIp=28;
- string ackAlarm=29;
- string clusterId=30;
- string taskId=31;
- string taskName=32;
- repeated PersonBaseInfo baseinfo =33;
- string collection=34;
- string ageDescription=35;
- repeated string tableId=36;
-}
+import "base.proto";
//Area缁撴瀯浣�
@@ -117,18 +16,26 @@
message Camera {
string id = 1;
string name = 2;
- int32 type = 3;
- string addr = 4;
- int32 areaid = 5;
- float longitude = 6;
- float latitude = 7;
- string rtsp = 8;
- string ip = 9;
- int32 port = 10;
- string username = 11;
- string password = 12;
- string brand = 13;
- string reserved = 14;
+ string alias = 3;
+ string snapshot_url = 4;//鎽勫儚鏈哄簳鍥惧揩鐓�
+ int32 type = 5;
+ string addr = 6;
+ float longitude = 7;
+ float latitude = 8;
+ int32 floor = 9;
+ string rtsp = 10;
+ string ip = 11;
+ int32 port = 12;
+ string username = 13;
+ string password = 14;
+ string brand = 15;
+ string reserved = 16;
+
+ bool is_running = 17;//鏄惁姝ｅ湪鍋氫换鍔★紙0:鍚︼紝1锛氭槸锛�
+ bool run_enable = 18;//鏄惁鍚敤瀹炴椂鎴栬疆璇�(0:鍚︼紝1锛氭槸)
+ int32 run_type = 19;//鍋氫换鍔＄殑绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃讹級
+ string run_server_id = 20;//褰撳墠姝ｅ湪鍝彴鏈嶅姟鍣ㄤ笂鍋氫换鍔�
+
}
//鎽勫儚鏈虹殑浠诲姟淇℃伅
@@ -154,10 +61,20 @@
repeated Sdk sdks = 2;
}
+message SdkRun {
+ string ipc_id = 1;
+ string sdk_type = 2;
+}
+
+message TaskSdkRun {
+ Task task = 1;
+ repeated SdkRun sdks = 2;
+}
+
//鎽勫儚鏈轰换鍔�
message CameraTask {
string id = 1;
- string camera_ids = 2;//鎽勫儚鏈篿d
+ string camera_id = 2;//鎽勫儚鏈篿d
string task_id = 3;//浠诲姟id
repeated DayCtl time_rule = 4;//甯冮槻鏃堕棿
string react_rule = 5;//鑱斿姩鏂瑰紡
@@ -167,7 +84,7 @@
bool enable = 9; //鏄惁鍚敤
int32 sort = 10; //浠诲姟鎺掑簭
bool is_full = 11;//鍙傛暟鏄惁璁剧疆瀹屾暣
- string link_group_id = 12;
+ string link_task_id = 12;
}
//鎽勫儚鏈哄竷闃茬殑鏃堕棿瑙勫垯锛屽彲浠ヨ缃涓�,鐢╥d鍏宠仈鍒板叿浣撶殑瑙勫垯閰嶇疆涓�
@@ -204,11 +121,16 @@
message TaskGroupArgs {
string task_id = 1;
repeated GroupRule group_rules = 2;
+ bool enable = 3;
}
message GroupRule {
string group_id = 1;
- repeated Rule rules = 2;
+ string group_text = 2;
+ int32 alarm_level = 3;
+ repeated Rule rules = 4;
+ string set_type = 5;
+ bool defence_state = 6;
}
message Rule {
@@ -229,16 +151,37 @@
//Sdk struct
message Sdk {
string id = 1;
- string sdk_type = 2;//绠楁硶绫诲瀷
- string sdk_name = 3;//sdk鍚嶇О
- repeated SdkArg args = 4;//绠楁硶鍙傛暟
- string icon = 5;//绠楁硶鍥炬爣
- string url = 6;//绠楁硶涓嬭浇鍦板潃
- string create_time = 7;
- string update_time = 8;
- string create_by = 9;
- bool enabled = 10;//鏄惁鍚敤
- int32 del_flag = 11;//鏄惁鍒犻櫎
+ string ipc_id = 2;
+ string sdk_type = 3;//绠楁硶绫诲瀷
+ string sdk_name = 4;//sdk鍚嶇О
+ repeated SdkArg args = 5;//绠楁硶鍙傛暟
+ string icon = 6;//绠楁硶鍥炬爣
+ string url = 7;//绠楁硶涓嬭浇鍦板潃
+ string create_time = 8;
+ string update_time = 9;
+ string create_by = 10;
+ bool enable = 11;//鏄惁鍚敤
+ 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
@@ -249,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
@@ -261,6 +206,10 @@
T_TaskSdk = 4;//浠诲姟绠楁硶鍙樺寲
T_TaskSdkRule = 5;//浠诲姟绠楁硶瑙勫垯鍙樺寲
T_Sdk = 6;//sdk鍙樺寲
+ T_CameraPolygon = 7;//鎽勫儚鏈哄杈瑰舰鍙樺寲
+ T_TimeRule = 8;//鏃堕棿瑙勫垯鍙樺寲
+ T_Server = 9;//鏈嶅姟鍣ㄤ俊鎭彉鍖�
+ T_PollConfig = 10;//杞閰嶇疆鍙樺寲
}
enum DbAction {
@@ -288,79 +237,107 @@
int32 defence_state = 8;
}
-
-// struct for sdk
-message Point{
- int32 x = 1;
- int32 y = 2;
-}
-message Rect{
- int32 left = 1;
- int32 top = 2;
- int32 right = 3;
- int32 bottom = 4;
-}
-// Image ipc struct
-message Image{
- int32 width = 1;
- int32 height = 2;
- bytes data = 3;
+message VideotapeInfo {
+ string esDataId = 1;
+ string cameraId = 2;
+ string taskId = 3;
+ int64 imgId = 4;
+ string videoUrl = 5;
+ repeated string sdkIds = 6;
+ int32 type = 7;
}
-message FaceAngle{
- int32 yaw = 1;
- int32 pitch =2;
- int32 roll = 3;
- float confidence =4;
-}
-message ThftResult{
- int32 gender = 1;
- int32 age = 2;
- int32 race = 3;
- int32 beauty = 4;
- int32 smile = 5;
-}
-message FacePos{
- Rect rcFace = 1;
- Point ptLeftEye = 2;
- Point ptRightEye = 3;
- Point ptMouth = 4;
- Point ptNose = 5;
- FaceAngle fAngle = 6;
- int32 quality = 7;
- bytes facialData = 8;
-}
-message FaceInfo{
- Rect rcFace = 1;
- Point ptLeftEye = 2;
- Point ptRightEye = 3;
- Point ptMouth = 4;
- Point ptNose = 5;
- FaceAngle fAngle = 6;
- int32 quality = 7;
- bytes facialData = 8;
- int64 faceID = 9;
-}
-message ObjInfo{
- Rect rcObj = 1;
- int32 typ = 2;
- float prob = 3;
+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;
}
-// sdk face property
-message ParamFacePos{
- FacePos pos = 1;
- ThftResult result = 2;
- Image img = 3;
-}
-// sdk face extract
-message ParamFaceCompare{
- bytes feat1 = 1;
- bytes feat2 = 2;
+message CompareEvent {
+ CompareEventType eventType =1;
+ bytes payload = 2;
}
-// sdk yolo detect
-message ParamYoloObj{
- repeated ObjInfo infos = 1;
- Image img = 2;
-}
\ No newline at end of file
+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