From 24ed193984da270b3cc5fd6d58803d95482c6ea1 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 16:09:42 +0800
Subject: [PATCH] 小结果中加了一个参数
---
algorithm/middleware/middleware.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index e1a3c2c..0c8c596 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -74,7 +74,7 @@
for _, areaMap := range sdkData.AreaMapList {
ruleResult := CallSo(sdk.Id, groupRule.Rules[j], areaMap,lable,args,message)
logger.Info("鍓嶇疆杩炴帴绗︼細",groupRule.Rules[j])
- if groupRule.Rules[j].RuleWithPre == "鈯�" {
+ if groupRule.Rules[j].RuleWithPre == "鈯�" && len(ruleResult.Target) > 0 {
assembleDta(args,groupRule.Rules[j-1],groupRule.Rules[j])
// 鎶婂綋鍓嶅皬瑙勫垯缁撴灉缃┖
ruleResult = structure.LittleRuleResult{}
@@ -330,7 +330,7 @@
break
}
}
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ return structure.LittleRuleResult{SdkName:am.SdkName, Result:rule.RuleWithPre + "" + flag, Sort:rule.Sort}
}
if rule.Operator == "unsatisfy" || rule.Operator == "!=" { // 涓嶆弧瓒虫墍閫夌殑鏃堕棿瑙勫垯
@@ -350,7 +350,7 @@
break
}
}
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ return structure.LittleRuleResult{SdkName:am.SdkName, Result:rule.RuleWithPre + "" + flag, Sort:rule.Sort}
}
}
@@ -479,7 +479,7 @@
for _, sdkData := range args.Sdkdata {
for _, areaMap := range sdkData.AreaMapList {
logger.Info("sdkId鍜屽尯鍩焛d纰版挒锛�",areaMap.SdkId,rule2.SdkId,"---",areaMap.AreaId,rule2.PolygonId)
- if areaMap.SdkId == rule2.SdkId && areaMap.AreaId == rule2.PolygonId {
+ if areaMap.AreaId == rule2.PolygonId {
area = *areaMap
goto second
}
--
Gitblit v1.8.0