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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index ae436b9..0c8c596 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -73,7 +73,8 @@
//logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", groupRule.Rules[j],sdkName,groupRule.Rules[j].SdkArgAlias, "---","")
for _, areaMap := range sdkData.AreaMapList {
ruleResult := CallSo(sdk.Id, groupRule.Rules[j], areaMap,lable,args,message)
- if groupRule.Rules[j].RuleWithPre == "鈯�" {
+ logger.Info("鍓嶇疆杩炴帴绗︼細",groupRule.Rules[j])
+ if groupRule.Rules[j].RuleWithPre == "鈯�" && len(ruleResult.Target) > 0 {
assembleDta(args,groupRule.Rules[j-1],groupRule.Rules[j])
// 鎶婂綋鍓嶅皬瑙勫垯缁撴灉缃┖
ruleResult = structure.LittleRuleResult{}
@@ -329,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 == "!=" { // 涓嶆弧瓒虫墍閫夌殑鏃堕棿瑙勫垯
@@ -349,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}
}
}
@@ -376,7 +377,7 @@
soName = "static.so"
case "812b674b-2375-4589-919a-5c1c3278a978":
soName = "plate.so"
- case "浜轰綋璺熻釜":
+ case "520af340-f257-4fe2-ac3c-695c390e53dc":
soName = "personTrack.so"
}
//soInfo,err := cache.GetSoInfoById(sdkId)
@@ -473,11 +474,12 @@
// 濡傛灉瑙勫垯缁勪腑鏈夊寘鍚鍙凤紝鎶婅鍒欑粍涔嬪悗鐨勮鍒欏搴旂殑绠楁硶鍜屽尯鍩熸彁鍙栫殑鏁版嵁瑁呴厤鍒板墠闈㈠幓
func assembleDta(args *structure.SdkDatas,rule1,rule2 *protomsg.Rule) {
// 鎷垮埌鍚庨潰鐨勯偅涓尯鍩熺殑鏁版嵁
- logger.Info("瑙﹀彂浜嗗寘鍚簨浠讹紝鎶婂悗鑰呯殑鏁版嵁缁欏埌鍓嶈��")
+ logger.Info("瑙﹀彂浜嗗寘鍚簨浠讹紝鎶婂悗鑰呯殑鏁版嵁缁欏埌鍓嶈��",*rule1,*rule2)
area := structure.AreaMap{}
for _, sdkData := range args.Sdkdata {
for _, areaMap := range sdkData.AreaMapList {
- if areaMap.SdkId == rule2.SdkId && areaMap.AreaId == rule2.PolygonId {
+ logger.Info("sdkId鍜屽尯鍩焛d纰版挒锛�",areaMap.SdkId,rule2.SdkId,"---",areaMap.AreaId,rule2.PolygonId)
+ if areaMap.AreaId == rule2.PolygonId {
area = *areaMap
goto second
}
@@ -486,6 +488,7 @@
second: for _, sdkData := range args.Sdkdata {
for _, areaMap := range sdkData.AreaMapList {
if areaMap.SdkId == rule1.SdkId && areaMap.AreaId == rule1.PolygonId {
+ logger.Info("绗簩娆dkId鍜屽尯鍩焛d纰版挒锛�",areaMap.SdkId,rule2.SdkId,"---",areaMap.AreaId,rule2.PolygonId)
// 鎷垮埌鍖呭惈绗︿箣鍓嶇殑鏁版嵁锛岄亶鍘嗚閰�
for _,arg := range areaMap.FilterData {
mergeArg(arg,area)
--
Gitblit v1.8.0