From 00306764cf332822a699fb0e9d7ef58798dbca15 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 14 十一月 2019 10:15:20 +0800
Subject: [PATCH] ---
---
algorithm/static/static.go | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index f652775..e8350b5 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -95,6 +95,7 @@
}
// 鍒ゆ柇涓�涓尯鍩熷唴鏈夋病鏈夐潤姝㈢殑鐩爣
func CompareAndSave(rule *protomsg.Rule, am *structure.AreaMap,lable *structure.Others,args *structure.SdkDatas,message *protomsg.SdkMessage) structure.LittleRuleResult {
+ logger.Info("璧颁簡涓綋闈欐鏍稿績绠楁硶")
initN := 5
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a977" && rule.SdkArgAlias == "duration" {
if init,err := strconv.Atoi(rule.SdkArgValue); err != nil {
@@ -161,18 +162,20 @@
// 鍒ゆ柇涓�涓洰鏍囨槸鍚﹂潤姝簡鎸囧畾鏃堕棿
func SingleStatic(person *structure.Obj, am *structure.AreaMap,lable *structure.Others, argValue float64) (bool,*structure.Arg){
+ logger.Info("鍗曚釜鐩爣鐨勫垽鏂細")
flag := false
var o *structure.Arg = nil
for _, obj := range am.FilterData {
if person.Id == obj.Id {
coincidenceDegree := PgsInterPercent(Rect2Point(person.Location), obj.Location, 1, 1)
+ logger.Info("鍒ゆ柇鐩爣鐨勯噸鍚堝害",coincidenceDegree)
o = obj
if coincidenceDegree >= argValue {
flag = true
}
}
}
- if flag { // 鏈変竴涓璞′繚鎸侀潤姝紙id鐩哥瓑骞朵笖閲嶅悎搴﹂珮浜庨槇鍊硷級
+ if flag { // 褰撳墠妫�娴嬪璞′繚鎸侀潤姝紙id鐩哥瓑骞朵笖閲嶅悎搴﹂珮浜庨槇鍊硷級
flagTime := TimerAlarm(lable,person,flag,am.AreaId)
if flagTime == "10" || flagTime == "11" {
return flag,o
@@ -188,7 +191,7 @@
// 鍒ゆ柇鏄惁绗﹀悎瀹氭椂鍣ㄦ潯浠�
func TimerAlarm(oth *structure.Others,person *structure.Obj, result bool,areaId string) (string) {
var flagTime string //
-
+ logger.Info("鐩爣鐨勫畾鏃跺櫒锛�")
rw.Lock()
if result { // 缁撴灉涓虹湡
--
Gitblit v1.8.0