From d09f65efe90826dd76eaf0ca7cc618df9b09c40d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 16 十一月 2019 12:53:00 +0800
Subject: [PATCH] 防止个体目标进入yolo结果
---
ruleserver/ruleToformula.go | 2 +-
algorithm/static/static.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index 282a506..6083668 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -142,7 +142,7 @@
// logger.Info("鍏蜂綋鐩爣锛�",tar.Location)
//}
for _, tar := range structure.StaticMap[am.AreaId].Targets {
- singleResult,arg := SingleStatic(tar,am,lable,90)
+ singleResult,arg := SingleStatic(tar,am,lable,95)
if singleResult {
flag = "true"
tars = append(tars,arg)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 5a08201..8c63f1c 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -184,7 +184,7 @@
islink = false
}
var labelTypes []int // 0涓簓olo鏍囩锛�1涓篺ace鏍囩 2涓轰袱鑰呮爣绛�
- if sdkNames != "" {
+ 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})
labelTypes = append(labelTypes,0)
//logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
--
Gitblit v1.8.0