From 0e3b3f245284f493a81e38595c1bc3f812c84baf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 15 十一月 2019 10:51:15 +0800
Subject: [PATCH] ---
---
structure/rule.go | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/structure/rule.go b/structure/rule.go
index ce55b80..10d4eba 100644
--- a/structure/rule.go
+++ b/structure/rule.go
@@ -1,15 +1,19 @@
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 // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤浜鸿劯鏁版嵁鐨勬椂鍊欑敤鐨勫埌
+ Location Rect // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤鐩爣鏁版嵁鐨勬椂鍊欑敤鐨勫埌
Feature []byte
ThftRes protomsg.ThftResult
Liker []*BaseInfo
@@ -30,10 +34,9 @@
TargetNum int // 鍖哄煙鍐呯洰鏍囨暟閲�
Args []*Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
FilterData []*Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
+ AlarmObj []*Arg // 鍖哄煙鍐呮渶鍚庢弧瓒宠鍒欑殑鐩爣
Time string // 褰撳墠鏃堕棿锛堢敤浠ュ尮閰嶆椂闂磋鍒欙級
IsEffective bool // 瑙勫垯涓槸鍚︾敤鍒颁簡姝ゅ尯鍩�
- KeepRight bool // 鏄惁闈犲彸琛�
- IsStatic bool // 鏄惁闈欐
}
// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
@@ -80,7 +83,8 @@
DefenceState bool // 鏄惁甯冮槻
AlarmLevel int32 // 鎶ヨ绛夌骇
RuleText string // 鏂囧瓧鐗堣鍒欑粍
- Location []TargetInfo // 鐩爣鐨勫潗鏍�
+ //Location []TargetInfo // 鐩爣鐨勫潗鏍�
+ AlarmObj []*Arg // 鎶ヨ鐨勭洰鏍囨暟鎹� 鎵撶畻搴熸帀涓婇潰鐨凩ocation
AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
IsLink bool // 鏄惁鏄仈鍔ㄤ换鍔�
Others
@@ -95,12 +99,6 @@
Rect
TargetId uint64
TargetScore float64
-}
-
-// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
-type TargetResult struct {
- Result
- Args []Arg
}
type LittleRuleResult struct {
SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
--
Gitblit v1.8.0