From 8c3063e420502667043e0e1bdb35eef05fbd133b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 14 十一月 2019 15:11:28 +0800
Subject: [PATCH] 结果标签大改动
---
algorithm/static/static.go | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index c0a1686..f33faf2 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -16,7 +16,10 @@
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" || rule.SdkArgAlias == "" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
return filterRule(rule, am)
} else if rule.SdkArgAlias == "duration" {
- return CompareAndSave(rule,am,lable,args,message)
+
+ lr := CompareAndSave(rule,am,lable,args,message)
+ logger.Info("涓綋闈欐瑙勫垯缁撴灉锛�",lr)
+ return lr
} else {
return structure.LittleRuleResult{}
}
@@ -109,11 +112,7 @@
initN = init
}
}
- logger.Info("鐪嬩竴涓嬮潤姝㈠尯鍩熷唴鐨勭洰鏍囷細",am.AreaId)
- for _, tar := range structure.StaticMap[am.AreaId].Targets {
- logger.Info("鍏蜂綋鐩爣锛�",tar.Location)
- }
- if len(structure.StaticMap[am.AreaId].Targets) == 0 { // 鍗崇涓�甯ф暟鎹�(涔熶笉涓�瀹�)锛岃繕娌℃湁缂撳瓨
+ if structure.StaticMap[am.AreaId] == nil || len(structure.StaticMap[am.AreaId].Targets) == 0 { // 鍗崇涓�甯ф暟鎹�(涔熶笉涓�瀹�)锛岃繕娌℃湁缂撳瓨
logger.Info("涔嬪墠鏃犵紦瀛�")
objs := []*structure.Obj{}
for _, tar := range am.FilterData {
@@ -127,6 +126,10 @@
flag := "false"
// 浠ヤ箣鍓嶉潤姝㈢殑瀵硅薄涓轰富鍒ゆ柇鏄惁闈欐
tars := []*structure.Arg{}
+ logger.Info("鐪嬩竴涓嬮潤姝㈠尯鍩熷唴鐨勭洰鏍囷細",am.AreaId)
+ for _, tar := range structure.StaticMap[am.AreaId].Targets {
+ logger.Info("鍏蜂綋鐩爣锛�",tar.Location)
+ }
for _, tar := range structure.StaticMap[am.AreaId].Targets {
singleResult,arg := SingleStatic(tar,am,lable,90)
if singleResult {
--
Gitblit v1.8.0