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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index b35ec43..938f6a1 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -512,16 +512,16 @@
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"
timeEle.AlarmFlag = true
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 {
--
Gitblit v1.8.0