From 249ccd77ae299e072161cac7870b94602454a2e3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 26 十一月 2019 12:29:42 +0800
Subject: [PATCH] Merge branch 'module' of http://192.168.5.5:10010/r/ruleprocess into module
---
ruleserver/ruleToformula.go | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index cb72ebc..a0abea7 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 {
// 鍏堣繃鐙珛锛屽啀杩囪仈鍔�
@@ -201,6 +202,7 @@
} else {
islink = false
}
+ logger.Info("瑙﹀彂鐨勫尯鍩焛d锛�",polygonId)
var labelTypes []int // 0涓簓olo鏍囩锛�1涓篺ace鏍囩 2涓轰袱鑰呮爣绛�
if sdkNames != "" && len(targets) == 0 {
args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, yolos, polygonId, islink,label})
@@ -209,7 +211,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 {
@@ -273,7 +275,6 @@
}
}
}
- //logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return faces
}
@@ -282,7 +283,6 @@
if len(am.FilterData) > 0 {
locations = am.FilterData
}
- //logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return locations
}
func putTargetsToResult(am *structure.AreaMap) []*structure.Arg {
@@ -290,7 +290,6 @@
if len(am.AlarmObj) > 0 {
locations = am.AlarmObj
}
- //logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return locations
}
// 鑱斿姩浠诲姟鐨勫鐞�
--
Gitblit v1.8.0