From 74b51d7b71fa71788754285691ecbaf5d34f7d70 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 16 十一月 2019 11:57:39 +0800
Subject: [PATCH] 为数据写入当前规则处理时间
---
structure/rule.go | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/structure/rule.go b/structure/rule.go
index 6a2f066..cd6cd74 100644
--- a/structure/rule.go
+++ b/structure/rule.go
@@ -13,10 +13,11 @@
Size float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
AreaJson string // 鎵�灞炲尯鍩�
IsYolo bool // 鏄惁鏄痽olo鏁版嵁
- Location Rect // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤浜鸿劯鏁版嵁鐨勬椂鍊欑敤鐨勫埌
+ Location Rect // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤鐩爣鏁版嵁鐨勬椂鍊欑敤鐨勫埌
Feature []byte
ThftRes protomsg.ThftResult
Liker []*BaseInfo
+ TimeLable string
CacheData ResultMsg
}
@@ -83,7 +84,8 @@
DefenceState bool // 鏄惁甯冮槻
AlarmLevel int32 // 鎶ヨ绛夌骇
RuleText string // 鏂囧瓧鐗堣鍒欑粍
- Location []TargetInfo // 鐩爣鐨勫潗鏍�
+ //Location []TargetInfo // 鐩爣鐨勫潗鏍�
+ AlarmObj []*Arg // 鎶ヨ鐨勭洰鏍囨暟鎹� 鎵撶畻搴熸帀涓婇潰鐨凩ocation
AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
IsLink bool // 鏄惁鏄仈鍔ㄤ换鍔�
Others
@@ -98,12 +100,6 @@
Rect
TargetId uint64
TargetScore float64
-}
-
-// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
-type TargetResult struct {
- Result
- Args []Arg
}
type LittleRuleResult struct {
SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
--
Gitblit v1.8.0