From cbe73e3706a6494b506febd0e4a51ce1096aae1f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 05 十二月 2019 17:21:46 +0800
Subject: [PATCH] 加跟踪算法，进程间通讯加sleep
---
structure/rule.go | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/structure/rule.go b/structure/rule.go
index 8ddf5fe..99604a4 100644
--- a/structure/rule.go
+++ b/structure/rule.go
@@ -5,23 +5,27 @@
)
// 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
-type Arg 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
+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
}
+type Arg struct {
+ SourceArg
+ AttachArg SourceArg
+}
// 姣忎釜鍖哄煙鍐呯殑鍥剧墖鏁版嵁闆嗗悎
type AreaMap struct {
CameraId string
@@ -36,7 +40,7 @@
TargetNum int // 鍖哄煙鍐呯洰鏍囨暟閲�
Args []*Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
FilterData []*Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
- AlarmObj []*Arg // 鍖哄煙鍐呮渶鍚庢弧瓒宠鍒欑殑鐩爣
+ AlarmObj []*Arg // 鍖哄煙鍐呮渶鍚庢弧瓒宠鍒欑殑鐩爣
Time string // 褰撳墠鏃堕棿锛堢敤浠ュ尮閰嶆椂闂磋鍒欙級
IsEffective bool // 瑙勫垯涓槸鍚︾敤鍒颁簡姝ゅ尯鍩�
}
@@ -46,10 +50,10 @@
Id string
Rects Rect // 鐭╁舰鍖哄煙鍙傛暟
Score float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
- Type string // 璁拌浇鏁版嵁绫诲瀷
+ Type string // 璁拌浇鏁版嵁绫诲瀷
ThftRes protomsg.ThftResult
Feature []byte
- Car *protomsg.PlateIDVehicle
+ Car *protomsg.PlateIDVehicle
}
// 姣忎釜绠楁硶瀵逛簬褰撳墠甯х敾闈㈣嚜宸辨彁鍙栫殑鏁版嵁
@@ -85,7 +89,7 @@
AlarmLevel int32 // 鎶ヨ绛夌骇
RuleText string // 鏂囧瓧鐗堣鍒欑粍
//Location []TargetInfo // 鐩爣鐨勫潗鏍�
- AlarmObj []*Arg // 鎶ヨ鐨勭洰鏍囨暟鎹� 鎵撶畻搴熸帀涓婇潰鐨凩ocation
+ AlarmObj []*Arg // 鎶ヨ鐨勭洰鏍囨暟鎹� 鎵撶畻搴熸帀涓婇潰鐨凩ocation
AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
IsLink bool // 鏄惁鏄仈鍔ㄤ换鍔�
Others
@@ -126,8 +130,5 @@
TargetPicUrl string `json:"targetPicUrl"`
MonitorLevel string `json:"monitorLevel"`
Content string `json:"content"`
- DbLabel string `json:"labels"`
- //PhoneNum string `json:"phoneNum"`
- //Sex string `json:"sex"`
- //IdCard string `json:"idCard"`
+ DbLabel string `json:"labels"`
}
--
Gitblit v1.8.0