From 2554f829d3b66b65bb323dfccd7e287d2226b2d9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 27 七月 2019 11:28:13 +0800
Subject: [PATCH] 追踪
---
ruleserver/personTrack.go | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 3d036f8..4a6404a 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -9,14 +9,14 @@
var TrackPond = make(map[string]*PersonTrack)
type PersonTrack struct {
- Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
- Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
}
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛� 鏀逛负鐩存帴妫�鏌ユ暟閲忔槸鍚︿竴鑷�
func IsSame(msg *protomsg.SdkMessage) {
- logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細",msg.Cid)
- logger.Debug("---------------------缂撳瓨姹�--------------------------锛�",TrackPond)
+ logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid)
+ logger.Debug("---------------------缂撳瓨姹�--------------------------锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
if len(sdkinfo.Sdkdata) > 1 {
@@ -27,27 +27,33 @@
continue
}
if TrackPond[msg.Cid] != nil {
- logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces),"鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細",TrackPond[msg.Cid].Face)
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Face)
} else {
- logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces),"杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
}
- if faceParam.Faces != nil && TrackPond[msg.Cid] != nil && len(faceParam.Faces) == TrackPond[msg.Cid].Face { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
+ if faceParam.Faces != nil && TrackPond[msg.Cid] != nil && len(faceParam.Faces) == TrackPond[msg.Cid].Face { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
faceParam.Faces = (faceParam.Faces)[0:0]
- sdkinfo.Sdkdata,err = proto.Marshal(&faceParam)
+ sdkinfo.Sdkdata, err = proto.Marshal(&faceParam)
if err != nil {
- logger.Error("浜鸿劯搴忓垪鍖栭敊璇�",err)
+ logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
}
- logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟",len(faceParam.Faces))
+ logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟", len(faceParam.Faces))
} else {
if TrackPond[msg.Cid] != nil {
- logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�",len(faceParam.Faces))
+ logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�", len(faceParam.Faces))
TrackPond[msg.Cid].Face = len(faceParam.Faces)
} else {
- logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�",len(faceParam.Faces))
- TrackPond[msg.Cid] = &PersonTrack{Face:len(faceParam.Faces)}
+ logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�", len(faceParam.Faces))
+ TrackPond[msg.Cid] = &PersonTrack{Face: len(faceParam.Faces)}
}
}
} else {
+ if TrackPond[msg.Cid] != nil {
+ TrackPond[msg.Cid].Face = 0
+ } else {
+ TrackPond[msg.Cid] = &PersonTrack{Face: 0}
+ }
+ logger.Info("娌℃湁浜鸿劯锛岃閲嶇疆涓�0")
continue
}
}
@@ -60,33 +66,39 @@
continue
}
var yoloNum int = 0
- for i := 0;i < len(yoloParam.Infos); i++ {
+ for i := 0; i < len(yoloParam.Infos); i++ {
if yoloParam.Infos[i].Typ == 0 {
yoloNum++
}
}
if TrackPond[msg.Cid] != nil {
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細",yoloNum,"鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細",TrackPond[msg.Cid].Yolo)
+ logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Yolo)
} else {
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細",yoloNum,"杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
+ 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)
+ sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
if err != nil {
- logger.Error("yolo搴忓垪鍖栭敊璇�",err)
+ logger.Error("yolo搴忓垪鍖栭敊璇�", err)
}
logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
} else {
if TrackPond[msg.Cid] != nil {
- logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�",yoloNum)
+ logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid].Yolo = yoloNum
} else {
- logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�",yoloNum)
- TrackPond[msg.Cid] = &PersonTrack{Yolo:yoloNum}
+ logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
}
}
} else {
+ if TrackPond[msg.Cid] != nil {
+ TrackPond[msg.Cid].Yolo = 0
+ } else {
+ TrackPond[msg.Cid] = &PersonTrack{Yolo: 0}
+ }
+ logger.Info("娌℃湁yolo锛岃閲嶇疆涓�0")
continue
}
}
--
Gitblit v1.8.0