From 10c90ed9d6eb67c93cd978c33d53f887f79bdd88 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 12 九月 2019 18:04:09 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 19f1656..63b1778 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)
@@ -434,7 +437,9 @@
// 寰楀嚭杩欑粍瀹屾暣瑙勫垯閲屾秹鍙婂埌鍑犱釜鎽勫儚鏈猴紝鍐冲畾鐫�鏁扮粍閲屾湁鍑犱釜缁撴瀯浣�,鍘婚噸娣诲姞鏂瑰紡
for j := 0; j < len(groupRule.Rules); j++ {
var flag1 bool = true
+ logger.Info("瑙勫垯缁勪俊鎭細",groupRule.Rules[j].CameraId)
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
+ logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁锛�",ruleRes.CameraId,ruleRes.Sort)
if groupRule.Rules[j].CameraId == ruleRes.CameraId {
flag1 = false
}
@@ -444,6 +449,7 @@
}
}
}
+ logger.Info("")
// 寰�鏁扮粍閲岃祴鍊�
isOk,labelTypes := RunRule(args, groupRule, taskId, message, label)
if isOk {
@@ -474,10 +480,8 @@
}
// 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧(鍗宠璧嬪�煎畬姣�)鍙緱鍑烘姤璀︾粨鏋�
var isPerfect = true
- logger.Info("鑱斿姩浠诲姟鏁扮粍锛�")
for _, va := range timeEle.RuleResults {
//logger.Info("---------------------鐬呯瀰褰撳墠鏁扮粍________________锛�", *va)
- logger.Info("鑱斿姩瀛愬厓绱狅細",va.Sort,va.RuleWithPre,va.Result,va.CameraId)
if va.Result == "" && va.RuleWithPre != "||" {
isPerfect = false
}
--
Gitblit v1.8.0