From ccc6e7876e1b1235e96b95c80d0fc9a2a3c1562f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 10 七月 2019 09:44:03 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 9549d5e..6727423 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -2,7 +2,6 @@
import (
"encoding/json"
- "fmt"
"ruleprocess/cache"
"ruleprocess/logger"
"sort"
@@ -248,13 +247,15 @@
}
}
}
+ // 浣滃紛锛岀洿鎺ヨ鍏舵瘮瀵瑰叏閮ㄥ簳搴�
+ compareFlag = 1
if compareFlag == 0 {
logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
return
}
for j := 0; j < len(groupRule.Rules); j++ {
// 鍙湁鏄汉鑴稿姣斿苟涓旈厤缃殑鍙傛暟鏄姣斿簳搴撴墠璧帮紙鑻ラ厤鐨勫姣旈槇鍊煎垯涓嶈蛋锛�
- if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && groupRule.Rules[j].SdkArgAlias == "compareBase" {
+ if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972"{
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
for _, areaMap := range sdkData.AreaMapList {
@@ -739,6 +740,7 @@
if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
+ logger.Info("--------------------缁堜簬绛夊埌浣犵殑涓嬫枃")
var args []Arg
if rule.RuleWithPre == "&&" {
args = am.filterData
--
Gitblit v1.8.0