From 9eda6d57e5c257c9031f7ebdee1ff45fd9996fd7 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 06 十一月 2019 14:57:26 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 67a0df8..ef2ebc7 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -71,7 +71,7 @@
// 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
fk := TrackOrNot(args.RuleResult)
if !fk {
- BodyIsSame(message)
+ BodyIsSame(args,message)
}
}
}
@@ -571,6 +571,7 @@
// 澶勭悊鐨勯兘鏄痽olo鏁版嵁
if rule.PolygonId == am.AreaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
+ logger.Info("鍖哄煙鏁版嵁锛�",am.AreaJson)
var args []*structure.Arg
if rule.RuleWithPre == "&&" {
args = am.FilterData
@@ -599,6 +600,9 @@
}
}
am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
+ for _,tar := range am.FilterData {
+ logger.Info("鍏蜂綋鐩爣鐨勫潗鏍囦负",tar.Id,tar.Location)
+ }
if am.TargetNum > 0 {
return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
} else {
--
Gitblit v1.8.0