From f8aa9316d6bf32392883081c3d08196f6ca344c9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 17 十二月 2019 11:11:10 +0800
Subject: [PATCH] compare 改为isHave
---
algorithm/middleware/middleware.go | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index 52973c2..d003668 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -75,7 +75,7 @@
ruleResult := CallSo(sdk.Id, groupRule.Rules[j], areaMap,lable,args,message)
logger.Info("鍓嶇疆杩炴帴绗︼細",groupRule.Rules[j])
if groupRule.Rules[j].RuleWithPre == "鈯�" && len(ruleResult.Target) > 0 {
- assembleDta(resultSplice[len(resultSplice)-1].Target,ruleResult.Target,)
+ assembleDta(resultSplice[len(resultSplice)-1].Target,ruleResult.Target)
// 鎶婂綋鍓嶅皬瑙勫垯缁撴灉缃┖
ruleResult = structure.LittleRuleResult{}
}
@@ -478,6 +478,7 @@
for _,target := range targets1 {
mergeArg(target,targets2)
targets2 = nil
+ logger.Info("瑁呴厤鍚庣殑浜轰綋鐩爣")
return // 瑁呴厤涓�娆″氨鍙互
}
}
@@ -488,7 +489,17 @@
logger.Info("浜鸿劯锛�",arg1.Location,arg1.Score)
precent := ruleserver.PgsInterPercent(Rect2Point(arg.Location),arg1.Location,1,1)
if precent > 99 {
- arg.AttachArg = arg1.SourceArg
+ face := structure.SourceArg{}
+ face.Score = arg1.Score
+ face.Location = arg1.Location
+ face.Feature = arg1.Feature
+ face.Uuid = arg1.Uuid
+ face.Type = arg1.Type
+ face.ThftRes = arg1.ThftRes
+ face.AreaJson = arg1.AreaJson
+ face.Liker = arg1.Liker
+ face.Proportion = arg1.Proportion
+ arg.AttachArg = face
}
}
}
--
Gitblit v1.8.0