From 27b1fc520f5bb8668d9ed7cae9a37c615d4c1221 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 15 十一月 2019 15:54:12 +0800
Subject: [PATCH] 灵敏度改为90
---
ruleserver/ruleToformula.go | 20 +++++++++-----------
algorithm/static/static.go | 2 +-
labelFilter/readyDataForLabel.go | 6 +++---
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index 163275b..3ceb127 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -140,7 +140,7 @@
// logger.Info("鍏蜂綋鐩爣锛�",tar.Location)
//}
for _, tar := range structure.StaticMap[am.AreaId].Targets {
- singleResult,arg := SingleStatic(tar,am,lable,95)
+ singleResult,arg := SingleStatic(tar,am,lable,90)
if singleResult {
flag = "true"
tars = append(tars,arg)
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index a5306b9..6dd9034 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -18,9 +18,9 @@
}
// 鎶婃暟鎹閰嶅埌label
func (label *Label)DataFormatToLabel(result structure.ResultMsg) {
- logger.Debug("face缁撴灉锛�",result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.Result)) > 0)
- logger.Debug("yolo缁撴灉锛�",result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0)
- if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.Result)) > 0) || (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0) { // 寰楁湁浜鸿劯鎴栬�厃olo瑙勫垯鎵嶅彲浠�
+ if (result.RuleResult["face"] != nil && len(result.RuleResult["face"].([]structure.Result)) > 0) ||
+ (result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0) ||
+ (result.RuleResult["target"] != nil && len(result.RuleResult["target"].([]structure.Result)) > 0){ // 寰楁湁浜鸿劯鎴栬�厃olo瑙勫垯鎵嶅彲浠�
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鎶ヨ鐨勫彲浠ユ帹閫佺殑
flag := false
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 097c6c8..37a495a 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -102,18 +102,10 @@
result := false
sdkNames := ""
polygonId := ""
- //targets11 := []*structure.Arg{} // 绗﹀悎鏉′欢鐨勭洰鏍�
+
// 鎶婁竴甯ф暟鎹拰涓�缁勮鍒欏彂缁欑畻娉曢儴鍒嗭紝寰楀嚭鍒ゆ柇缁撴灉
result,sdkNames,polygonId = CallMiddleware(args,*groupRule,&label,message)
- //for _, sdkData := range args.Sdkdata {
- // for _, areaMap := range sdkData.AreaMapList {
- // targets11 = append(targets11,areaMap.AlarmObj...)
- // for _,obj := range areaMap.AlarmObj {
- // logger.Info("涓綋闈欐鐨勭洰鏍�",obj.Id, obj.Location, obj.CacheData.Cid, len(obj.CacheData.Data))
- // }
- // }
- //}
- //logger.Info("绗﹀悎鏉′欢鐨勭洰鏍囨暟鎹細",targets)
+
if result {
// 鏈�鍚庤繃鎸佺画鏃堕棿绛夋椂闂寸淮搴︾殑鏉′欢 鎶婃椂闂磋鍒欎綅缃皟鏁村埌杩欎釜浣嶇疆鏄负浜嗙紦瀛樻暟鎹� 锛侊紒锛侊紒锛乸s: 瀵圭敾闈腑鍗曚釜鐩爣鍋氬畾鏃跺櫒鐨勪笉鐢ㄥ啀杩囩敾闈㈠畾鏃跺櫒
cacheId := ""
@@ -430,7 +422,10 @@
func duration(rule *protomsg.Rule, groupId string, am *structure.AreaMap, args *structure.SdkDatas, message *protomsg.SdkMessage) string{
cacheId := ""
if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
- if rule.SdkArgAlias == "duration" && rule.SdkId != "812b674b-2375-4589-919a-5c1c3278a977"{ // 鎺掗櫎瀵圭敾闈腑鍗曚釜鐩爣鐨勭畻娉曪紝涓綋闈欐浠ュ強闈犲彸琛岃繖绉�
+ if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a977" { // 鎺掗櫎瀵圭敾闈腑鍗曚釜鐩爣鐨勭畻娉曪紝涓綋闈欐浠ュ強闈犲彸琛岃繖绉�
+ return ""
+ }
+ if rule.SdkArgAlias == "duration" {
//logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欐潯瑙勫垯鐨勫畾鏃跺櫒,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
rw.Lock()
@@ -443,6 +438,9 @@
}
if flag {
+ m := make(map[string]interface{})
+ m["yolo"] = []structure.Result{}
+ m["yolo"] = append(m["yolo"].([]structure.Result), structure.Result{args.TaskId, "", "", true, 0, "", am.FilterData, am.AreaJson, false,*lable})
timeLength, _ := strconv.Atoi(rule.SdkArgValue)
timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: structure.ResultMsg{message, nil}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
//TimeEleList = make(map[string]timeElement)
--
Gitblit v1.8.0