From 54f7bb20860ec5a98964290c721113d71ea6e408 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 19:57:55 +0800
Subject: [PATCH] 上传人脸
---
ruleserver/ruleToformula.go | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 8fc77d2..3e5be33 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -4,7 +4,6 @@
"encoding/json"
"fmt"
"log"
- "os"
"ruleprocess/cache"
"sort"
"strconv"
@@ -253,7 +252,7 @@
for _, sdkData := range args.Sdkdata {
for _, areaMap := range sdkData.AreaMapList {
for j := 0; j < len(groupRule.Rules); j++ {
- putFaceToResult(groupRule.Rules[j], &areaMap, faces)
+ faces = append(faces,putFaceToResult(groupRule.Rules[j], &areaMap)...)
}
}
}
@@ -331,15 +330,16 @@
for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
if groupRule.Rules[j].SdkId == sdkData.SdkId && sdkData.IsYolo && !strings.Contains(sdkName,sdkData.SdkName) { // 鍙褰晊olo绗﹀悎瑙勫垯鐨剆dk 鍚屾椂瑕侀伩鍏嶉噸澶嶆嫾鎺�
- sdkName = sdkName + "," + sdkData.SdkName
+ sdkName = sdkData.SdkName + " "
}
}
}
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkName, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText})
- log.Println("-------------------yolo缁撴灉鏍囩",args.RuleResult["yolo"].([]Result))
- if args.RuleResult["faces"] != nil {
- log.Println("-------------------face缁撴灉鏍囩",args.RuleResult["faces"].([]Arg))
- os.Exit(1)
+ if sdkName != "" {
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkName, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText})
+ log.Println("-------------------yolo缁撴灉鏍囩",args.RuleResult["yolo"].([]Result))
+ }
+ if args.RuleResult["face"] != nil {
+ log.Println("-------------------face缁撴灉鏍囩",args.RuleResult["face"].([]Arg))
}
return true
} else {
@@ -351,14 +351,18 @@
}
}
-func putFaceToResult(rule *protomsg.Rule, am *AreaMap, faces []Arg) {
+func putFaceToResult(rule *protomsg.Rule, am *AreaMap) []Arg {
+ faces := []Arg{}
if rule.SdkId == am.sdkId {
if len(am.filterData) > 0 {
for _, data := range am.filterData {
+ log.Println("---------------------------------------------------------------------鏈夎繖涓猟ata",data)
faces = append(faces, data)
}
}
}
+ log.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
+ return faces
}
// 璁＄畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘
--
Gitblit v1.8.0