From e3f9b39c5c0f96315d409e09d92ce704b9c6385b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 11:20:01 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 73f84b7..e662dbd 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -429,7 +429,16 @@
va.Result = strconv.FormatBool(isOk)
tempMap := make(map[string]interface{})
for k,result := range args.RuleResult {
- tempMap[k] = result
+ if k == "yolo" {
+ for _,res := range result.([]Result) {
+ tempMap[k] = append(tempMap[k].([]Result),res)
+ }
+ }
+ if k == "face" {
+ for _,res := range result.([]FaceResult) {
+ tempMap[k] = append(tempMap[k].([]FaceResult),res)
+ }
+ }
}
for _,result := range args.RuleResult["yolo"].([]Result) {
for k,_ := range result.Others {
@@ -476,10 +485,11 @@
//}
for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++ {
if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婂師鏉ラ偅涓垹鎺夊啀瀛樹竴浠芥柊鐨�
- res := args.RuleResult["yolo"].([]Result)[i]
- res.Others["linkCache"] = label["linkCache"]
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result)[:i],args.RuleResult["yolo"].([]Result)[i+1:]...)
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result),res)
+ args.RuleResult["yolo"].([]Result)[i].Others["linkCache"] = label["linkCache"]
+ //res := args.RuleResult["yolo"].([]Result)[i]
+ //res.Others["linkCache"] = label["linkCache"]
+ //args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result)[:i],args.RuleResult["yolo"].([]Result)[i+1:]...)
+ //args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result),res)
}
}
}
--
Gitblit v1.8.0