From 4c478e6467d64fc39d89df25f6b9ab289fc0fb93 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 29 七月 2019 15:51:50 +0800
Subject: [PATCH] 调整人体追踪
---
insertdata/insertDataToEs.go | 6 ++++--
ruleserver/personTrack.go | 19 +++++++++++--------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index f4611a7..5d1c08d 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -120,8 +120,10 @@
logger.Debug("鎻掑叆鏁版嵁鍓嶇湅鐪嬫姤璀︽爣蹇椾綅锛�", timeLabel)
if timeLabel == "01" { // 鏃犲畾鏃跺櫒鐘舵�佽鎻掑叆鐨勬姤璀︽暟鎹�
InsertFace(msg)
- ruleserver.BodyIsSame(msg.SdkMessage)
- InsertYolo(msg)
+ flag := ruleserver.BodyIsSame(msg.SdkMessage)
+ if !flag {
+ InsertYolo(msg)
+ }
}
if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
InsertFace(msg)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 33c6ae9..bd1ed57 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -45,11 +45,11 @@
}
}
}
- logger.Debug("---------------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
+ logger.Debug("--------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
}
// 杩借釜浜轰綋锛屾鏌ユ暟閲忔槸鍚︿竴鑷�
-func BodyIsSame(msg *protomsg.SdkMessage) {
+func BodyIsSame(msg *protomsg.SdkMessage) bool{
logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "Yolo" {
@@ -72,12 +72,13 @@
logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
}
if yoloParam.Infos != nil && TrackPond[msg.Cid] != nil && yoloNum == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
- yoloParam.Infos = (yoloParam.Infos)[0:0]
- sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
- if err != nil {
- logger.Error("yolo搴忓垪鍖栭敊璇�", err)
- }
+ //yoloParam.Infos = (yoloParam.Infos)[0:0]
+ //sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
+ //if err != nil {
+ // logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ //}
logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
+ return true
} else {
if TrackPond[msg.Cid] != nil {
logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
@@ -86,6 +87,7 @@
logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
}
+ return false
}
} else {
if TrackPond[msg.Cid] != nil {
@@ -98,7 +100,8 @@
}
}
}
- logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
+ logger.Debug("---------------------------------杩借釜缁撴潫--------------------------------------")
+ return false
}
// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
--
Gitblit v1.8.0