From b2510c56349d4bde09f344a7efc94543814b0a82 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 19:18:35 +0800
Subject: [PATCH] face相关
---
ruleserver/ruleToformula.go | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 20ddd1c..a7d4ba8 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -253,7 +253,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,14 +331,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))
+ 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))
os.Exit(1)
}
return true
@@ -351,14 +353,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
}
// 璁＄畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘
@@ -394,7 +400,7 @@
a.time = time.Unix(time.Now().Unix(), 0).String()[11:16]
a.keepRight = arg.KeepRight
a.isStatic = arg.IsStatic
- log.Println("--------------------鐪嬬湅鍖哄煙鏁版嵁锛�",*a)
+ //log.Println("--------------------鐪嬬湅鍖哄煙鏁版嵁锛�",*a)
}
// 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
@@ -522,7 +528,7 @@
func filterRule(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a971" {
// 澶勭悊鐨勬槸浜鸿劯绠楁硶 濡傛灉杩欐潯瑙勫垯閰嶇疆鐨勬槸浜鸿劯绠楁硶锛岃繃婊ゅ畬鏉′欢涔嬪悗鐩存帴寰楀嚭缁撴灉锛屽洜涓鸿偗瀹氭病鏈夋暟閲忔潯浠讹紝鑷繁鎷兼帴
- log.Println("------------------------------------------------------------------------------------------------------------------------------------缁堜簬绛夊埌浣�")
+
if rule.SdkId == am.sdkId && rule.PolygonId == am.areaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a971" {
@@ -560,6 +566,7 @@
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 浜鸿劯妫�娴�
+ log.Println("------------------------------------------------------------------------------------------------------------------------------------缁堜簬绛夊埌浣�")
if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
@@ -589,6 +596,7 @@
am.targetNum = len(am.filterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
}
if am.targetNum > 0 {
+ log.Println("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
} else {
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
--
Gitblit v1.8.0