From b149d73c29df3170af79d4d85da1be44692b3acc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 30 七月 2019 20:30:36 +0800
Subject: [PATCH] 联动任务缓存数据
---
ruleserver/ruleToformula.go | 11 +++++------
ruleserver/timeTicker.go | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 3f875ec..3d46d58 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -1,7 +1,6 @@
package ruleserver
import (
- "fmt"
"os"
"ruleprocess/cache"
"ruleprocess/logger"
@@ -331,8 +330,8 @@
}
} else {
// 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏃跺�欎负鍋囩殑鐘舵�佸弽杞暟鎹篃闇�瑕佽褰曚笅鏉�
- timeFlag := TimerAlarm(args, groupRule.GroupId, result.(bool))
- fmt.Println(timeFlag)
+ //timeFlag := TimerAlarm(args, groupRule.GroupId, result.(bool))
+ //fmt.Println(timeFlag)
return false
}
} else {
@@ -600,7 +599,7 @@
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欐潯瑙勫垯鐨勫畾鏃跺櫒,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
var flag bool = true
for k, _ := range TimeEleList {
- if k == rule.Id {
+ if k == groupId+"+"+rule.Id {
flag = false // 鏈夊氨缃负false
logger.Info("鏈夎繖涓畾鏃跺櫒锛屼笉鍐嶅垱寤轰簡锛�")
}
@@ -610,8 +609,8 @@
timeLength, _ := strconv.Atoi(rule.SdkArgValue)
timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: ResultMsg{message, args.RuleResult}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
//TimeEleList = make(map[string]timeElement)
- TimeEleList[rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互褰撳墠鎸佺画鏃堕棿灏忚鍒檌d涓洪敭
- //logger.Info("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
+ TimeEleList[groupId+"+"+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互褰撳墠鎸佺画鏃堕棿灏忚鍒檌d涓洪敭
+ logger.Info("鍒涘缓浜嗚鏁板櫒")
}
}
}
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index fcc5104..e236763 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -75,7 +75,7 @@
flag := false
for k, _ := range TimeEleList {
//logger.Debug("-----------------鐪嬬湅杩欎釜key鍜実roupId", k, groupId)
- if strings.Contains(k, groupId) {
+ if strings.Contains(k, groupId) && k != groupId{
flag = true
}
}
@@ -106,7 +106,7 @@
}
} else { // 缁撴灉涓哄亣
for k, timeEle := range TimeEleList {
- if strings.Contains(k, groupId) {
+ if strings.Contains(k, groupId) && k != groupId{
if timeEle.AlarmFlag {
if timeEle.BufferFlag == 0 {
logger.Debug("------------------------------鏉�姝诲畾鏃跺櫒锛屾姤璀︽甯х姸鎬佹敼鍙樼殑鏁版嵁锛屾鏃剁殑璁℃暟鍣ㄧ殑鍊间负", timeEle.N)
--
Gitblit v1.8.0