From 0845ec988d33fc0109386265d0834398d8c69970 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 18:43:06 +0800
Subject: [PATCH] face相关
---
ruleserver/ruleToformula.go | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 00e6b2e..f78bcfd 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -249,11 +249,11 @@
}
}
// 杩囧畬鏉′欢鏁版嵁鍚庢妸绗﹀悎鏉′欢鐨勪汉鑴告暟鎹杩涚粨鏋滄爣绛鹃噷
- faces := []Arg{}
+
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)
+ args.RuleResult["face"] = putFaceToResult(groupRule.Rules[j], &areaMap)
}
}
}
@@ -338,8 +338,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))
+ if args.RuleResult["face"] != nil {
+ log.Println("-------------------face缁撴灉鏍囩",args.RuleResult["face"].([]Arg))
os.Exit(1)
}
return true
@@ -352,15 +352,17 @@
}
}
-func putFaceToResult(rule *protomsg.Rule, am *AreaMap, faces []Arg) []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")
+ log.Println("---------------------------------------------------------------------鏈夎繖涓猟ata",data)
faces = append(faces, data)
}
}
}
+ log.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return faces
}
--
Gitblit v1.8.0