From 63394e220d61b67f86b6c9c0fe1405af80eaafb4 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 21 十一月 2019 15:41:24 +0800
Subject: [PATCH] ---

---
 structure/rule.go |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/structure/rule.go b/structure/rule.go
index d038743..8ddf5fe 100644
--- a/structure/rule.go
+++ b/structure/rule.go
@@ -12,9 +12,9 @@
 	Proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
 	Size       float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
 	AreaJson   string  // 鎵�灞炲尯鍩�
-	IsYolo     bool    // 鏄惁鏄痽olo鏁版嵁
+	Type       string  // 璁拌浇鏁版嵁绫诲瀷
 	Location   Rect    // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤鐩爣鏁版嵁鐨勬椂鍊欑敤鐨勫埌
-	Car		   *protomsg.PlateID // 杞﹁締鍙傛暟
+	Car		   *protomsg.PlateIDVehicle // 杞﹁締鍙傛暟
 	Feature    []byte
 	ThftRes    protomsg.ThftResult
 	Liker      []*BaseInfo
@@ -46,10 +46,10 @@
 	Id      string
 	Rects   Rect    // 鐭╁舰鍖哄煙鍙傛暟
 	Score   float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
-	IsYolo  bool    // 鏄惁鏄痽olo鏁版嵁
+	Type  	string  // 璁拌浇鏁版嵁绫诲瀷
 	ThftRes protomsg.ThftResult
 	Feature []byte
-	Car		*protomsg.PlateID
+	Car		*protomsg.PlateIDVehicle
 }
 
 // 姣忎釜绠楁硶瀵逛簬褰撳墠甯х敾闈㈣嚜宸辨彁鍙栫殑鏁版嵁
@@ -121,12 +121,13 @@
 	TableName    string  `json:"tableName"`
 	BwType       string  `json:"bwType"`
 	CompareScore float64 `json:"compareScore"`
-	PersonId     string  `json:"personId"`
-	PersonName   string  `json:"personName"`
-	PersonPicUrl string  `json:"personPicUrl"`
-	PhoneNum     string  `json:"phoneNum"`
-	Sex          string  `json:"sex"`
-	IdCard       string  `json:"idCard"`
+	TargetId     string  `json:"targetId"`
+	TargetName   string  `json:"targetName"`
+	TargetPicUrl string  `json:"targetPicUrl"`
 	MonitorLevel string  `json:"monitorLevel"`
 	Content      string  `json:"content"`
+	DbLabel		 string	 `json:"labels"`
+	//PhoneNum     string  `json:"phoneNum"`
+	//Sex          string  `json:"sex"`
+	//IdCard       string  `json:"idCard"`
 }

--
Gitblit v1.8.0