From 37e0cf80dde971cd10cf1d57377c7729b008881d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 04 七月 2019 09:46:03 +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 1924eea..c11831f 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -307,7 +307,7 @@
completeFormula = completeFormula + va.Result
}
if completeFormula != "" {
- log.Println("鐪嬬湅鍏紡-----------锛�", completeFormula)
+ log.Println("缁撴灉鍏紡-----------锛�", completeFormula)
expression, _ := govaluate.NewEvaluableExpression(completeFormula)
if strings.HasPrefix(completeFormula,"&&") || strings.HasPrefix(completeFormula,"||"){
panic("瑙勫垯鏈夎锛屽緱鍒扮殑鏁板鍏紡涓嶅彲瑙ｆ瀽")
@@ -787,7 +787,7 @@
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
formula1 := timeSlot.End + " > " + am.time
- log.Println("-----------------鏃堕棿瑙勫垯涓嶆弧瓒崇殑鍏紡end锛�",formula)
+ log.Println("-----------------鏃堕棿瑙勫垯涓嶆弧瓒崇殑鍏紡end锛�",formula1)
expression1, _ := govaluate.NewEvaluableExpression(formula1) // 寰楀埌鏁板鍏紡
result1, _ := expression1.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) && result1.(bool) {
--
Gitblit v1.8.0