From ac8aa9785bc3c31afb7eb5a430efdf45cf9dccc3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 13 七月 2019 15:24:41 +0800
Subject: [PATCH] 修改定时器的缓存结果标签
---
ruleserver/ruleToformula.go | 8 +++++++-
ruleserver/timeTicker.go | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 74719eb..c392196 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -489,6 +489,12 @@
if args.RuleResult["face"] != nil {
logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]Arg)))
}
+ // 缁欏畾鏃跺櫒閲岀紦瀛樼殑閭ｅ抚鏁版嵁璧嬬粨鏋滄爣绛�
+ for k, timeEle := range TimeEleList {
+ if strings.Contains(k, groupRule.GroupId) {
+ timeEle.CacheSdkData.RuleResult = args.RuleResult
+ }
+ }
return true
} else {
return false
@@ -873,7 +879,7 @@
if flag {
timeLength, _ := strconv.Atoi(rule.SdkArgValue)
- timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, CacheSdkData: &ResultMsg{message,args.RuleResult}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
+ timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, CacheSdkData: ResultMsg{message,nil}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
//TimeEleList = make(map[string]timeElement)
TimeEleList[groupId+" "+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互鎽勫儚鏈篿d鎷兼帴鍖哄煙id涓洪敭
logger.Info("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index 7e2cecf..c119195 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -17,7 +17,7 @@
InitN int // 璧嬪�煎悗灏变笉鍙樼殑鍒濆鍊�
BufferFlag int // 缂撳啿瀹归敊浣� 杩炵画甯alse鎵嶄负false
AlarmFlag bool // 鎶ヨ鏍囧織浣� 瀹氭椂鍣ㄥ紑鍚悗绗竴娆℃姤璀︽椂浼氳缃负true 寰�鍚庡啀鏉ユ姤璀︿篃涓嶄細鎻掕繘ES
- CacheSdkData *ResultMsg // 瀹氭椂鍣ㄧ殑缂撳瓨鏁版嵁 鎸佺画鏃堕棿绫荤殑寮�鍚畾鏃跺櫒鏃惰缂撳瓨涓�甯�
+ CacheSdkData ResultMsg // 瀹氭椂鍣ㄧ殑缂撳瓨鏁版嵁 鎸佺画鏃堕棿绫荤殑寮�鍚畾鏃跺櫒鏃惰缂撳瓨涓�甯�
GroupId string // 鑱斿姩瑙勫垯闇�瑕佽褰曚笅姝ゆ椂鐨勮鍒欑粍id
RuleResults []*RuleResult
}
--
Gitblit v1.8.0