From 9ac06d86026340a0dfe0348068d7659b04abfe7e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 19:20:07 +0800
Subject: [PATCH] 去掉faces的终止程序
---
ruleserver/ruleToformula.go | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 00e6b2e..3e5be33 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -4,7 +4,6 @@
"encoding/json"
"fmt"
"log"
- "os"
"ruleprocess/cache"
"sort"
"strconv"
@@ -253,10 +252,11 @@
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)...)
}
}
}
+ args.RuleResult["face"] = faces
// 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
@@ -338,9 +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))
- os.Exit(1)
+ if args.RuleResult["face"] != nil {
+ log.Println("-------------------face缁撴灉鏍囩",args.RuleResult["face"].([]Arg))
}
return true
} else {
@@ -352,15 +351,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