From 36a80880733955a4ed33b476a17a82ec682ff845 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 16 八月 2019 14:40:53 +0800
Subject: [PATCH] 结果为假时也走定时器裁决
---
ruleserver/ruleToformula.go | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 84569b7..270d352 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -117,7 +117,7 @@
// 鎷垮埌鏈憚鍍忔満鐨勫尯鍩�
cameraPolygons := GetPolygons(args.CameraId)
// 鎶婃墍鏈夌殑sdk鎻愬彇鐨勬暟鎹兘鎸夋墍灞炴憚鍍忔満鐨勫尯鍩熷綊缃�
- //logger.Debug("褰撳墠鎽勫儚鏈篿d涓猴細",message.Cid,"褰撳墠鎽勫儚鏈烘墽琛岀殑浠诲姟鏄細",message.Tasklab.Taskname)
+ logger.Debug("褰撳墠鎽勫儚鏈篿d涓猴細",message.Cid,"褰撳墠鎽勫儚鏈烘墽琛岀殑浠诲姟鏄細",message.Tasklab.Taskname,"--浠诲姟id涓猴細",message.Tasklab.Taskid)
for _, arg := range args.Sdkdata {
SdkDataFormat(args.CameraId, arg, cameraPolygons)
}
@@ -370,8 +370,8 @@
}
} else {
- // 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏃跺�欎负鍋囩殑鐘舵�佸弽杞暟鎹篃闇�瑕佽褰曚笅鏉�
- //timeFlag := TimerAlarm(args, groupRule.GroupId, result.(bool))
+ // 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏉�姝诲畾鏃跺櫒鐨勬搷浣�
+ TimerAlarm(&label, groupRule.GroupId, result.(bool))
//fmt.Println(timeFlag)
return false
}
@@ -491,20 +491,22 @@
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
- // 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
- label.LinkCache = []ResultMsg{}
- for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
- label.LinkCache = append(label.LinkCache, ruleRes.CacheData)
- }
- logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�", len(label.LinkCache))
- for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++ {
- if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
- args.RuleResult["yolo"].([]Result)[i].Others.LinkCache = label.LinkCache
+ if TimeEleList[groupRule.GroupId] != nil { // 鏋佸伓灏旀湁鎯呭喌浼氱瓑浜巒il锛屼笉鐭ラ亾涓哄暐锛屽仛涓垽鏂互闃插畷鏈�
+ // 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
+ label.LinkCache = []ResultMsg{}
+ for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
+ label.LinkCache = append(label.LinkCache, ruleRes.CacheData)
}
- }
- for i := 0; i < len(args.RuleResult["face"].([]FaceResult)); i++ {
- if args.RuleResult["face"].([]FaceResult)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
- args.RuleResult["face"].([]FaceResult)[i].Others.LinkCache = label.LinkCache
+ logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�", len(label.LinkCache))
+ for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++ {
+ if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
+ args.RuleResult["yolo"].([]Result)[i].Others.LinkCache = label.LinkCache
+ }
+ }
+ for i := 0; i < len(args.RuleResult["face"].([]FaceResult)); i++ {
+ if args.RuleResult["face"].([]FaceResult)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
+ args.RuleResult["face"].([]FaceResult)[i].Others.LinkCache = label.LinkCache
+ }
}
}
}
--
Gitblit v1.8.0