From fe090f3f0d4d135622d631f1798b9414d6bd81cf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 20 十一月 2019 16:35:50 +0800
Subject: [PATCH] 事件推送改造
---
ruleserver/ruleToformula.go | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 1a64371..aa47c69 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -36,6 +36,7 @@
args.RuleResult["yolo"] = []structure.Result{}
args.RuleResult["face"] = []structure.Result{}
args.RuleResult["target"] = []structure.Result{}
+ args.RuleResult["plate"] = []structure.Result{}
//logger.Warn("浼犺繘鍘讳箣鍓嶆槸浠�涔堝痉琛岋細",args.RuleResult["yolo"])
if taskGroup != nil && len(taskGroup.GroupRules) > 0 {
// 鍏堣繃鐙珛锛屽啀杩囪仈鍔�
@@ -186,7 +187,8 @@
// 杞﹁締鐩爣缁熻
cars := []*structure.Arg{}
for _, sdkData := range args.Sdkdata {
- if sdkData.IpcId == "91d923ef-6200-4549-ab1b-8e773e85d729" && sdkNames != "" { // 鎶婅溅鐗屾暟鎹殑鍚勪釜鐩爣鐨勫潗鏍囪緭鍑烘柟渚垮悗闈㈢敾妗�
+ logger.Info("鐪嬬湅sdkNames",sdkNames)
+ if sdkData.IpcId == "91d923ef-6200-4549-ab1b-8e773e85d729" { // 鎶婅溅鐗屾暟鎹殑鍚勪釜鐩爣鐨勫潗鏍囪緭鍑烘柟渚垮悗闈㈢敾妗�
for _, areaMap := range sdkData.AreaMapList {
if areaMap.IsEffective {
cars = append(cars, putFaceToResult(areaMap, cars)...)
@@ -208,7 +210,7 @@
}
if faceFlag {
args.RuleResult["face"] = append(args.RuleResult["face"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, faces, polygonId, islink,label})
- //logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
+ logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]structure.Result)))
labelTypes = append(labelTypes,1)
}
if len(targets) > 0 {
--
Gitblit v1.8.0