From 355284a3ac944515951d4c2a7ec5d3964fb13857 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 31 十月 2019 13:48:29 +0800
Subject: [PATCH] 把人体追踪从es最前改为放在规则最后
---
insertdata/insertDataToEs.go | 15 +--------------
ruleserver/ruleToformula.go | 6 ++++++
labelFilter/readyDataForLabel.go | 1 +
labelFilter/ruleForLabel.go | 15 +--------------
4 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 25200e0..6f42c9a 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -165,20 +165,7 @@
videoPersonUrl = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.VideoPersons.IndexName + "/" + EsInfo.EsIndex.VideoPersons.IndexType
personAction = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.Personaction.IndexName + "/" + EsInfo.EsIndex.Personaction.IndexType
InsertFace(msg, "")
- // 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
- fk := ruleserver.TrackOrNot(msg.RuleResult)
- if fk {
- InsertYolo(msg, "")
- //if msg.Cid == "61de081a-7ed9-4970-8432-41d642c35456" {
- // logger.Warn("鎹曟崏188鎽勫儚鏈虹殑鎸佺画鏃堕棿浠诲姟.....")
- // os.Exit(1)
- //}
- } else {
- flag := ruleserver.BodyIsSame(msg.SdkMessage)
- if !flag {
- InsertYolo(msg, "")
- }
- }
+ InsertYolo(msg, "")
}
// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
diff --git a/labelFilter/readyDataForLabel.go b/labelFilter/readyDataForLabel.go
index c7f405d..6d94756 100644
--- a/labelFilter/readyDataForLabel.go
+++ b/labelFilter/readyDataForLabel.go
@@ -38,6 +38,7 @@
}
}
if result.RuleResult["yolo"] != nil && len(result.RuleResult["yolo"].([]structure.Result)) > 0 {
+
for _,yoloGroup := range result.RuleResult["yolo"].([]structure.Result) {
label.DefenceLevel = append(label.DefenceLevel,yoloGroup.AlarmLevel)
}
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index ce3fcca..fa27f8f 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -5,25 +5,12 @@
"basic.com/pubsub/protomsg.git"
"basic.com/valib/logger.git"
"github.com/knetic/govaluate"
- "ruleprocess/ruleserver"
"ruleprocess/structure"
"strconv"
"time"
)
-func PushSomthing (msg structure.ResultMsg) {
- // 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
- fk := ruleserver.TrackOrNot(msg.RuleResult)
- if fk {
- Judge(msg)
- } else {
- flag := ruleserver.BodyIsSame(msg.SdkMessage)
- if !flag {
- Judge(msg)
- }
- }
-}
-func Judge(msg structure.ResultMsg) {
+func PushSomthing(msg structure.ResultMsg) {
defer func() {
if err := recover(); err != nil {
logger.Error("浜嬩欢鎺ㄩ�佹ā鍧楀効鐨勫紓甯告崟鑾凤細",err)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index d099a52..67a0df8 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -67,6 +67,12 @@
}
}
}
+ // 浜轰綋杩借釜
+ // 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
+ fk := TrackOrNot(args.RuleResult)
+ if !fk {
+ BodyIsSame(message)
+ }
}
}
}
--
Gitblit v1.8.0