From 1af27cee5a419bcd445375693f9bc437e6483b6f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 03 七月 2019 13:35:16 +0800
Subject: [PATCH] 人脸过滤
---
ruleserver/ruleToformula.go | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 00e6b2e..cb8295b 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -4,7 +4,6 @@
"encoding/json"
"fmt"
"log"
- "os"
"ruleprocess/cache"
"sort"
"strconv"
@@ -253,9 +252,19 @@
for _, sdkData := range args.Sdkdata {
for _, areaMap := range sdkData.AreaMapList {
for j := 0; j < len(groupRule.Rules); j++ {
- args.RuleResult["face"] = putFaceToResult(groupRule.Rules[j], &areaMap, faces)
+ faces = append(faces,putFaceToResult(groupRule.Rules[j], &areaMap)...)
}
}
+ }
+ // 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
+ flag := false
+ for j := 0; j < len(groupRule.Rules); j++ {
+ if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a971" {
+ flag = true
+ }
+ }
+ if flag {
+ args.RuleResult["face"] = faces
}
// 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
for j := 0; j < len(groupRule.Rules); j++ {
@@ -338,9 +347,8 @@
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 args.RuleResult["face"] != nil {
+ log.Println("-------------------face缁撴灉鏍囩",args.RuleResult["face"].([]Arg))
}
return true
} else {
@@ -352,15 +360,16 @@
}
}
-func putFaceToResult(rule *protomsg.Rule, am *AreaMap, faces []Arg) []Arg {
- if rule.SdkId == am.sdkId {
+func putFaceToResult(rule *protomsg.Rule, am *AreaMap) []Arg {
+ faces := []Arg{}
+ if rule.SdkId == am.sdkId && rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a971"{
if len(am.filterData) > 0 {
for _, data := range am.filterData {
- log.Println("---------------------------------------------------------------------鏈夎繖涓猟ata")
faces = append(faces, data)
}
}
}
+ //log.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return faces
}
--
Gitblit v1.8.0