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 | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 95e7e00..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 {
@@ -416,7 +415,7 @@
// 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧(鍗宠璧嬪�煎畬姣�)鍙緱鍑烘姤璀︾粨鏋�
var isPerfect = true
for _, va := range timeEle.RuleResults {
- logger.Info("---------------------鐬呯瀰褰撳墠鏁扮粍________________锛�", *va)
+ //logger.Info("---------------------鐬呯瀰褰撳墠鏁扮粍________________锛�", *va)
if va.Result == "" && va.RuleWithPre != "||" {
isPerfect = false
}
@@ -597,10 +596,10 @@
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
if rule.SdkArgAlias == "duration" { //
logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
- // 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欎釜鎽勫儚鏈鸿繖涓尯鍩熺殑瀹氭椂鍣�,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
+ // 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欐潯瑙勫垯鐨勫畾鏃跺櫒,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
var flag bool = true
for k, _ := range TimeEleList {
- if k == groupId+" "+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[groupId+" "+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互缁勮鍒檌d鍜屽綋鍓嶆寔缁椂闂村皬瑙勫垯id涓洪敭
- //logger.Info("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
+ TimeEleList[groupId+"+"+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互褰撳墠鎸佺画鏃堕棿灏忚鍒檌d涓洪敭
+ logger.Info("鍒涘缓浜嗚鏁板櫒")
}
}
}
--
Gitblit v1.8.0