From ab7b24801e14a0d17180a3b8d0b522344440a8a0 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 13 七月 2019 11:31:01 +0800
Subject: [PATCH] 定时器中判断条件换下位置
---
ruleserver/ruleToformula.go | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index fc16429..938f6a1 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -503,6 +503,7 @@
// 鍒ゆ柇鏈夋棤姝よ鍒欑粍鐨勫畾鏃跺櫒
flag := false
for k,_ := range TimeEleList {
+ logger.Debug("-----------------鐪嬬湅杩欎釜key鍜実roupId",k,groupId)
if strings.Contains(k, groupId) {
flag = true
}
@@ -511,6 +512,11 @@
if result { // 缁撴灉涓虹湡
for k, timeEle := range TimeEleList {
if strings.Contains(k, groupId) {
+ if timeEle.N == 0 && timeEle.AlarmFlag {
+ logger.Debug("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
+ flagTime = "11"
+ args.RuleResult["timeLabel"] = flagTime
+ }
if timeEle.N == 0 && !timeEle.AlarmFlag { // 杩欑粍瑙勫垯鐨勫畾鏃跺櫒瑕佸叏閮ㄧ瓑浜�0 鏆備笖璁や负涓�缁勮鍒欏彧鏈変竴涓畾鏃跺櫒
logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------棣栨绗﹀悎鎸佺画鏃堕棿瑙勫垯骞舵姤璀�")
flagTime = "10"
@@ -518,28 +524,24 @@
args.RuleResult["cacheData"] = timeEle.CacheSdkData
args.RuleResult["timeLabel"] = flagTime
}
- if timeEle.N == 0 && timeEle.AlarmFlag {
- logger.Debug("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
- flagTime = "11"
- args.RuleResult["timeLabel"] = flagTime
- }
if timeEle.N != 0 {
flagTime = "00"
+ logger.Debug("------------------------缁撴灉涓虹湡浣嗚鏁板櫒涓嶅埌0锛屼笉鎶ヨ,姝ゆ椂鐨勮鏁板櫒鐨勫�间负锛�",timeEle.N)
}
}
}
} else { // 缁撴灉涓哄亣
for k, timeEle := range TimeEleList {
if strings.Contains(k, groupId) {
+ logger.Debug("------------------------------閲嶇疆瀹氭椂鍣紝姝ゆ椂鐨勮鏁板櫒鐨勫�间负",timeEle.N)
timeEle.N = timeEle.InitN // 閲嶇疆瀹氭椂鍣�
timeEle.CacheSdkData = SdkDatas{} // 鎶婄紦瀛樻暟鎹墧浜�
flagTime = "12"
- logger.Debug("------------------------------閲嶇疆瀹氭椂鍣�")
}
}
}
- } else {
+ } else { // 鏃犲畾鏃跺櫒
if result {
flagTime = "01"
} else {
@@ -815,6 +817,7 @@
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
am.filterData = am.filterData[0:0]
+ logger.Debug("鐪嬬湅args锛氾細锛氾細锛�",args)
for _, arg := range args {
var formula string
if rule.SdkArgAlias == "score" {
--
Gitblit v1.8.0