From 168266264d89a7e9f10401178937a7dd15e76de3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 14 十一月 2019 11:52:56 +0800
Subject: [PATCH] 限制一下score等过滤条件走的次数

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

diff --git a/structure/rule.go b/structure/rule.go
index 60fe306..6a2f066 100644
--- a/structure/rule.go
+++ b/structure/rule.go
@@ -1,18 +1,23 @@
 package structure
 
-import "basic.com/pubsub/protomsg.git"
+import (
+	"basic.com/pubsub/protomsg.git"
+)
 
 // 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
 type Arg struct {
 	Id         uint64
+	Uuid	   string
 	Score      float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
 	Proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
 	Size       float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
+	AreaJson   string  // 鎵�灞炲尯鍩�
 	IsYolo     bool    // 鏄惁鏄痽olo鏁版嵁
 	Location   Rect    // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤浜鸿劯鏁版嵁鐨勬椂鍊欑敤鐨勫埌
 	Feature    []byte
 	ThftRes    protomsg.ThftResult
 	Liker      []*BaseInfo
+	CacheData  ResultMsg
 }
 
 // 姣忎釜鍖哄煙鍐呯殑鍥剧墖鏁版嵁闆嗗悎
@@ -29,10 +34,9 @@
 	TargetNum     int    // 鍖哄煙鍐呯洰鏍囨暟閲�
 	Args          []*Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
 	FilterData    []*Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
+	AlarmObj	  []*Arg // 鍖哄煙鍐呮渶鍚庢弧瓒宠鍒欑殑鐩爣
 	Time          string // 褰撳墠鏃堕棿锛堢敤浠ュ尮閰嶆椂闂磋鍒欙級
 	IsEffective   bool   // 瑙勫垯涓槸鍚︾敤鍒颁簡姝ゅ尯鍩�
-	KeepRight     bool   // 鏄惁闈犲彸琛�
-	IsStatic      bool   // 鏄惁闈欐
 }
 
 // sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
@@ -68,7 +72,7 @@
 
 type ResultMsg struct {
 	*protomsg.SdkMessage
-	RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []FaceResult, yolo: []Result
+	RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []FaceResult, yolo: []Result  target
 }
 
 // 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
@@ -97,7 +101,7 @@
 }
 
 // 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
-type FaceResult struct {
+type TargetResult struct {
 	Result
 	Args []Arg
 }

--
Gitblit v1.8.0