From 34ab325a3da7d937bc27b6ba1116a28a7fac8082 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 10 七月 2019 17:47:20 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index ee1e18b..1f0cc05 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -438,6 +438,7 @@
} else {
// 鍒ゆ柇鎸佺画鏃堕棿鏉′欢锛屽幓鐪嬫睜瀛愰噷鏄惁鏈変笌鏈抚鏁版嵁鏈夊叧鐨勫畾鏃跺櫒锛屽鏋滄湁锛岀湅姝ゆ椂鏄惁璧板埌0锛屾病鏈夋瀹氭椂鍣ㄦ垨鏈夊畾鏃跺櫒璧板埌0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
var flag bool = true
+ logger.Info("flag 鏄細",flag)
for k, timeEle := range TimeEleList {
if strings.Contains(k, taskId) {
if timeEle.N != 0 { // 璺熻繖涓换鍔℃湁鍏崇殑瀹氭椂鍣ㄨ鍏ㄩ儴绛変簬0
@@ -446,7 +447,7 @@
}
}
}
- if flag {
+ if true {
// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
logger.Info("------------------------------鏈�鍚庝竴鍏�")
@@ -797,25 +798,15 @@
}
// 閮借繃婊ゅ畬鏉′欢涔嬪悗鐪嬬湅鏄惁婊¤冻鎸佺画鏃堕棿鏉′欢
-func duration(rule *protomsg.Rule, am *AreaMap, args *SdkDatas) LittleRuleResult{
+func duration(rule *protomsg.Rule, am *AreaMap, args *SdkDatas) {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
if rule.SdkArgAlias == "duration" { //
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欎釜鎽勫儚鏈鸿繖涓尯鍩熺殑瀹氭椂鍣�,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
var flag bool = true
- for k,value := range TimeEleList {
+ for k,_ := range TimeEleList {
if k == am.taskId+" "+am.sdkId+" "+am.areaId {
flag = false // 鏈夊氨缃负false
logger.Info("鏈夎繖涓畾鏃跺櫒锛屼笉鍐嶅垱寤轰簡锛�")
- // 鐪嬬湅瀹氭椂鍣ㄤ腑鐨勫�兼槸鍚︿负0 濡傛灉涓�0搴旇鎶ヨ锛屽鏋滀笉涓�0杩斿洖false锛屾湭杈惧埌鎸佺画鏃堕棿鐨勮姹�
- if value.N == 0 && !value.AlarmFlag{
- // 鎶ヨ涔嬪悗鏀逛负缃负true 鍚庨潰鐨勬姤璀﹀浘鐗囧氨涓嶆姤浜�,椤轰究鎶婄紦瀛樼殑閭ｅ紶鍥剧墖涔熺粰缁撴灉鏍囩
- value.AlarmFlag = true
- args.RuleResult["cacheData"] = value.CacheSdkData
- return LittleRuleResult{am.sdkName, "true" + "" + rule.RuleWithPre, rule.Sort}
- }else {
- logger.Info("------------------------------鎸佺画鏃堕棿鏉′欢涓嶆弧瓒�")
- return LittleRuleResult{am.sdkName, "false" + "" + rule.RuleWithPre, rule.Sort}
- }
}
}
@@ -825,11 +816,9 @@
//TimeEleList = make(map[string]timeElement)
TimeEleList[am.taskId+" "+am.sdkId+" "+am.areaId] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互鎽勫儚鏈篿d鎷兼帴鍖哄煙id涓洪敭
logger.Info("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
- return LittleRuleResult{am.sdkName, "false" + "" + rule.RuleWithPre, rule.Sort}
}
}
}
- return LittleRuleResult{}
}
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
--
Gitblit v1.8.0