From 84aeb755f5a7cb9e6f35a43d2435b0d0a6a66d38 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 03 八月 2019 11:29:23 +0800
Subject: [PATCH] 条件过滤中不涉及时间规则的东西
---
ruleserver/ruleToformula.go | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index f4b6312..5ddfec0 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -279,8 +279,8 @@
}
if completeFormula != "" {
logger.Info("缁撴灉鍏紡-----------锛�", completeFormula)
- expression, err := govaluate.NewEvaluableExpression(completeFormula)
- if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err != nil {
+ expression, err2 := govaluate.NewEvaluableExpression(completeFormula)
+ if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err2 != nil {
panic("瑙勫垯鏈夎锛屽緱鍒扮殑鏁板鍏紡涓嶅彲瑙ｆ瀽")
}
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -574,15 +574,17 @@
}
am.targetNum = len(am.filterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.targetNum)
- }
- if am.targetNum > 0 {
- logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ if am.targetNum > 0 {
+ logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ } else {
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ }
} else {
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
} else {
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return LittleRuleResult{}
}
} else {
return LittleRuleResult{}
--
Gitblit v1.8.0