From 3134f08a8772f30d463bef22654e0a927eda025b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 30 七月 2019 20:12:56 +0800
Subject: [PATCH] 联动任务缓存数据

---
 ruleserver/ruleToformula.go |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 95e7e00..f08bb0b 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -416,7 +416,7 @@
 		// 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧(鍗宠璧嬪�煎畬姣�)鍙緱鍑烘姤璀︾粨鏋�
 		var isPerfect = true
 		for _, va := range timeEle.RuleResults {
-			logger.Info("---------------------鐬呯瀰褰撳墠鏁扮粍________________锛�", *va)
+			//logger.Info("---------------------鐬呯瀰褰撳墠鏁扮粍________________锛�", *va)
 			if va.Result == "" && va.RuleWithPre != "||" {
 				isPerfect = false
 			}
@@ -610,7 +610,7 @@
 				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[groupId+" "+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互缁勮鍒檌d鍜屽綋鍓嶆寔缁椂闂村皬瑙勫垯id涓洪敭
+				TimeEleList[rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互褰撳墠鎸佺画鏃堕棿灏忚鍒檌d涓洪敭
 				//logger.Info("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
 			}
 		}

--
Gitblit v1.8.0