From 10d76b18b246b8bc0344c704ff6bc5ae8e310be9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 15:43:55 +0800
Subject: [PATCH] 换个比分转化
---
ruleserver/ruleToformula.go | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 7100bd7..e8c0fbc 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -335,11 +335,11 @@
//logger.Debug("------locations鐨勫唴瀹癸細", locations)
if sdkNames != "" {
args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,label})
- logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
+ //logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
}
if faceFlag {
args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId,label},faces})
- logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
+ //logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
}
return true
} else {
@@ -430,18 +430,14 @@
tempMap := make(map[string]interface{})
for k,result := range args.RuleResult {
if k == "yolo" {
- logger.Info("鏈夋病鏈墆olo鏍囩")
tempMap[k] = []Result{}
for _,res := range result.([]Result) {
- logger.Info("杩涗竴娆olo寰幆")
tempMap[k] = append(tempMap[k].([]Result),res)
}
}
if k == "face" {
- logger.Info("鏈夋病鏈塮ace鏍囩")
tempMap[k] = []FaceResult{}
for _,res := range result.([]FaceResult) {
- logger.Info("杩涗竴娆ace寰幆")
tempMap[k] = append(tempMap[k].([]FaceResult),res)
}
}
@@ -484,6 +480,11 @@
args.RuleResult["yolo"].([]Result)[i].Others.LinkCache = label.LinkCache
}
}
+ for i := 0; i < len(args.RuleResult["face"].([]FaceResult)); i++ {
+ if args.RuleResult["face"].([]FaceResult)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
+ args.RuleResult["face"].([]FaceResult)[i].Others.LinkCache = label.LinkCache
+ }
+ }
}
}
} else {
--
Gitblit v1.8.0