From 9a5986e795af4a120088c80b9d62a18a63190f6b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 11:48:47 +0800
Subject: [PATCH] ---

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

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index ba1e3d2..a49ba6c 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -348,7 +348,7 @@
 	if completeFormula != "" {
 		expression, _ := govaluate.NewEvaluableExpression(completeFormula)
 		result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
-		fmt.Println("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勯櫎浜嗘寔缁椂闂村鐨勪竴鏁存潯瑙勫垯涓嬬殑鍒ゆ柇缁撴灉", result)
+		//fmt.Println("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勯櫎浜嗘寔缁椂闂村鐨勪竴鏁存潯瑙勫垯涓嬬殑鍒ゆ柇缁撴灉", result)
 		// 鐢变簬澶╃劧鎴栫殑鍏崇郴锛屾弧瓒充竴涓氨璇ユ姤璀�,鍗宠甯ф暟鎹浜庢煇涓换鍔$殑鏌愪釜瑙勫垯缁勫簲璇ユ姤璀�
 		if !result.(bool) { // 濡傛灉涓嶇鍚堟潯浠讹紝搴旇閲嶇疆瀹氭椂鍣ㄥ厓绱狅紝绛夌鍚堟椂鍐嶅紑鍚�,鎶妅ey涓寘鍚换鍔d鐨則imeEle閮介噸缃�
 			for k, timeEle := range TimeEleList {
@@ -418,12 +418,14 @@
 			}
 			// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
 			am.filterData = am.filterData[0:0]
+			log.Println("鐪嬩竴涓嬪綋鍓嶅皬瑙勫垯锛�",*rule)
 			for _, arg := range args {
 				var formula string
 				if rule.SdkArgAlias == "score" {
 					formula = strconv.FormatFloat(arg.score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
 				} else if rule.SdkArgAlias == "proportion" {
 					formula = strconv.FormatFloat(arg.proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
+					fmt.Println("鍗犳瘮鐨勫瓧绗︿覆鍏紡锛�--------",formula)
 				} else {
 					formula = strconv.FormatFloat(arg.size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
 				}

--
Gitblit v1.8.0