From 9c9d127a3e6d117da7e914689c88e6bbff922269 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 12 九月 2019 15:57:30 +0800
Subject: [PATCH] 联动任务---
---
ruleserver/ruleToformula.go | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 2911c50..7634abd 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -426,6 +426,9 @@
timeEle = *timeEle1
}
}
+ for _,ruleRe := range timeEle.RuleResults {
+ logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁----",ruleRe.CameraId,ruleRe.Sort)
+ }
if flag { // 濡傛灉杩樻病鏈夎繖涓畾鏃跺櫒鍏冪礌灏辨柊澧炰竴涓�
//timeEle := TimeElement{N: 2, InitN: 2, GroupId: groupRule.GroupId} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
//TimeEleList = make(map[string]timeElement)
@@ -435,6 +438,7 @@
for j := 0; j < len(groupRule.Rules); j++ {
var flag1 bool = true
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
+ logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁锛�",ruleRes.CameraId,ruleRes.Sort)
if groupRule.Rules[j].CameraId == ruleRes.CameraId {
flag1 = false
}
@@ -444,6 +448,7 @@
}
}
}
+ logger.Info("")
// 寰�鏁扮粍閲岃祴鍊�
isOk,labelTypes := RunRule(args, groupRule, taskId, message, label)
if isOk {
@@ -520,13 +525,13 @@
// 鍊掓槸鎶婃墦鐨勭粍瑙勫垯鏍囩缁欏幓鎺変簡鍟�
for _,val := range labelTypes {
if val == 0 {
- if len(args.RuleResult["yolo"].([]Result)) > 1 {
+ if len(args.RuleResult["yolo"].([]Result)) >= 1 {
lens := len(args.RuleResult["yolo"].([]Result))-1
args.RuleResult["yolo"] = args.RuleResult["yolo"].([]Result)[0:lens]
}
}
if val == 1 {
- if len(args.RuleResult["face"].([]FaceResult)) > 1 {
+ if len(args.RuleResult["face"].([]FaceResult)) >= 1 {
lens := len(args.RuleResult["face"].([]FaceResult))-1
args.RuleResult["face"] = args.RuleResult["face"].([]FaceResult)[0:lens]
}
--
Gitblit v1.8.0