From 273a54e2a56de2735d7e51890f7de63b1390afb0 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 19:35:08 +0800
Subject: [PATCH] ---
---
ruleserver/timeTicker.go | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index e236763..e6219ed 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -28,7 +28,7 @@
Sort int32 // 鎽勫儚鏈哄湪瑙勫垯缁勪腑搴忓彿
Result string // 鎽勫儚鏈鸿繃婊ゆ暟鎹緱鍑虹殑缁撴灉
RuleWithPre string // 鎽勫儚鏈轰箣闂寸殑杩炴帴绗�
- CacheData *ResultMsg // 缂撳瓨褰撳墠甯ф暟鎹�
+ CacheData ResultMsg // 缂撳瓨褰撳墠甯ф暟鎹�
}
func TimeTicker() {
@@ -69,7 +69,7 @@
}
// 鍒ゆ柇鏄惁绗﹀悎瀹氭椂鍣ㄦ潯浠�
-func TimerAlarm(args *SdkDatas, groupId string, result bool) (string) {
+func TimerAlarm(oth *Others, groupId string, result bool) (string) {
var flagTime string //
// 鍒ゆ柇鏈夋棤姝よ鍒欑粍鐨勫畾鏃跺櫒
flag := false
@@ -82,19 +82,19 @@
if flag { // 鏈夊畾鏃跺櫒
if result { // 缁撴灉涓虹湡
for k, timeEle := range TimeEleList {
- if strings.Contains(k, groupId) {
+ if strings.Contains(k, groupId) && k != groupId{
if timeEle.N == 0 && timeEle.AlarmFlag {
logger.Debug("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
flagTime = "11"
- args.RuleResult["timeLabel"] = flagTime
+ oth.TimeLabel = flagTime
}
if timeEle.N == 0 && !timeEle.AlarmFlag { // 杩欑粍瑙勫垯鐨勫畾鏃跺櫒瑕佸叏閮ㄧ瓑浜�0 鏆備笖璁や负涓�缁勮鍒欏彧鏈変竴涓畾鏃跺櫒
logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------棣栨绗﹀悎鎸佺画鏃堕棿瑙勫垯骞舵姤璀�")
flagTime = "10"
timeEle.AlarmFlag = true
- args.RuleResult["cacheData"] = []ResultMsg{}
- args.RuleResult["cacheData"] = append(args.RuleResult["cacheData"].([]ResultMsg),timeEle.CacheSdkData)
- args.RuleResult["timeLabel"] = flagTime
+ oth.CacheData = []ResultMsg{}
+ oth.CacheData = append(oth.CacheData,timeEle.CacheSdkData)
+ oth.TimeLabel = flagTime
}
if timeEle.N != 0 {
flagTime = "00"
@@ -111,7 +111,7 @@
if timeEle.BufferFlag == 0 {
logger.Debug("------------------------------鏉�姝诲畾鏃跺櫒锛屾姤璀︽甯х姸鎬佹敼鍙樼殑鏁版嵁锛屾鏃剁殑璁℃暟鍣ㄧ殑鍊间负", timeEle.N)
flagTime = "12"
- args.RuleResult["timeLabel"] = flagTime
+ oth.TimeLabel = flagTime
delete(TimeEleList, k)
} else {
if timeEle.BufferFlag > 0 {
@@ -127,7 +127,7 @@
} else { // 鏃犲畾鏃跺櫒
if result {
flagTime = "01"
- args.RuleResult["timeLabel"] = flagTime
+ oth.TimeLabel = flagTime
} else {
flagTime = "00"
}
--
Gitblit v1.8.0