From 1b14a0ec217e5b6816f9f6b3254106be0db61fad Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 17:43:30 +0800
Subject: [PATCH] 追加数据

---
 structure/rule.go |   52 +++++++++++++++++++++++++++-------------------------
 1 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/structure/rule.go b/structure/rule.go
index 2389cca..1629a82 100644
--- a/structure/rule.go
+++ b/structure/rule.go
@@ -6,26 +6,27 @@
 
 // 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
 type SourceArg struct {
-	Id            string
-	Uuid          string
-	Score         float64                  // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
-	Proportion    float64                  // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
-	Size          float64                  // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
-	AreaJson      string                   // 鎵�灞炲尯鍩�
-	Type          string                   // 璁拌浇鏁版嵁绫诲瀷
-	Location      Rect                     // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤鐩爣鏁版嵁鐨勬椂鍊欑敤鐨勫埌
-	Car           *protomsg.PlateIDVehicle // 杞﹁締鍙傛暟
-	Feature       []byte
-	ThftRes       protomsg.ThftResult
-	Liker         []*BaseInfo
-	TimeLable     string
-	CacheData     ResultMsg
+	Id          string
+	Uuid        string
+	Score       float64                  // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
+	Proportion  float64                  // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
+	Size        float64                  // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
+	AreaJson    string                   // 鎵�灞炲尯鍩�
+	Type        string                   // 璁拌浇鏁版嵁绫诲瀷
+	Location    Rect                     // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤鐩爣鏁版嵁鐨勬椂鍊欑敤鐨勫埌
+	Car         *protomsg.PlateIDVehicle // 杞﹁締鍙傛暟
+	Feature     string
+	ThftRes     protomsg.ThftResult
+	Liker       []*BaseInfo
+	TimeLable   string
+	CacheData   ResultMsg
 }
 
 type Arg struct {
 	SourceArg
 	AttachArg SourceArg
 }
+
 // 姣忎釜鍖哄煙鍐呯殑鍥剧墖鏁版嵁闆嗗悎
 type AreaMap struct {
 	CameraId      string
@@ -46,14 +47,15 @@
 }
 
 type SourcePhoto struct {
-	Id      string
-	Rects   Rect    // 鐭╁舰鍖哄煙鍙傛暟
-	Score   float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
-	Type    string  // 璁拌浇鏁版嵁绫诲瀷
-	ThftRes protomsg.ThftResult
-	Feature []byte
-	Car     *protomsg.PlateIDVehicle
+	Id          string
+	Rects       Rect    // 鐭╁舰鍖哄煙鍙傛暟
+	Score       float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
+	Type        string  // 璁拌浇鏁版嵁绫诲瀷
+	ThftRes     protomsg.ThftResult
+	Feature     string
+	Car         *protomsg.PlateIDVehicle
 }
+
 // sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
 type PhotoMap struct {
 	SourcePhoto
@@ -87,13 +89,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
@@ -112,7 +113,8 @@
 type LittleRuleResult struct {
 	SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
 	Result  string // 宸插寘鍚簡鍓嶇疆杩炴帴绗�
-	Sort    int32
+	Sort    int32  // 瑙勫垯搴忓彿
+	Target  []*Arg
 }
 
 type TimeRange struct {

--
Gitblit v1.8.0