From fab26a9861ee7ce4652b4c15483cfc8e833b28d3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 13 十二月 2019 11:08:29 +0800
Subject: [PATCH] ---

---
 structure/rule.go |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/structure/rule.go b/structure/rule.go
index 99604a4..a6fe8d5 100644
--- a/structure/rule.go
+++ b/structure/rule.go
@@ -45,8 +45,7 @@
 	IsEffective   bool   // 瑙勫垯涓槸鍚︾敤鍒颁簡姝ゅ尯鍩�
 }
 
-// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
-type PhotoMap struct {
+type SourcePhoto struct {
 	Id      string
 	Rects   Rect    // 鐭╁舰鍖哄煙鍙傛暟
 	Score   float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
@@ -54,6 +53,11 @@
 	ThftRes protomsg.ThftResult
 	Feature []byte
 	Car     *protomsg.PlateIDVehicle
+}
+// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
+type PhotoMap struct {
+	SourcePhoto
+	AttachObj SourcePhoto
 }
 
 // 姣忎釜绠楁硶瀵逛簬褰撳墠甯х敾闈㈣嚜宸辨彁鍙栫殑鏁版嵁
@@ -83,13 +87,12 @@
 // 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
 type Result struct {
 	TaskId       string // 浠诲姟id
-	SdkName      string
+	SdkName      string // 绠楁硶鍚嶇О
 	RuleGroupId  string // 瑙勫垯缁刬d
 	DefenceState bool   // 鏄惁甯冮槻
 	AlarmLevel   int32  // 鎶ヨ绛夌骇
 	RuleText     string // 鏂囧瓧鐗堣鍒欑粍
-	//Location     []TargetInfo // 鐩爣鐨勫潗鏍�
-	AlarmObj     []*Arg // 鎶ヨ鐨勭洰鏍囨暟鎹�  鎵撶畻搴熸帀涓婇潰鐨凩ocation
+	AlarmObj     []*Arg // 鎶ヨ鐨勭洰鏍囨暟鎹�
 	AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
 	IsLink       bool   // 鏄惁鏄仈鍔ㄤ换鍔�
 	Others

--
Gitblit v1.8.0