From c965b5f040dab6542bb3b6e217165fbe1c02c146 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 19 十一月 2019 17:42:58 +0800
Subject: [PATCH] 插入个体静止数据时插入目标
---
insertdata/insertDataToEs.go | 2 +-
ruleserver/personTrack.go | 25 ++++++++++++-------------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 809ebb3..78d2723 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -593,7 +593,7 @@
false,
false,
nil,
- nil,
+ targetInfos,
linkTag,
linkTagInfos,
}
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 7ddfee7..e6d1c1c 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -12,10 +12,10 @@
var lock = sync.RWMutex{}
type PersonTrack struct {
- Faces []*Face // 浜鸿劯鐨勬暟缁� 鏀逛负鏁伴噺
+ Objs []*Obj // 浜鸿劯鐨勬暟缁�
Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
}
-type Face struct {
+type Obj struct {
Id uint64
Score float32
}
@@ -27,7 +27,6 @@
logger.Debug("+++++++++++++++++++++浜鸿劯杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- logger.Info("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
num = 25
FaceIsInPond(msg.Cid, sdkinfo)
@@ -39,11 +38,11 @@
if TrackPond[msg.Cid] != nil {
logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
lock.Lock()
- TrackPond[msg.Cid].Faces = nil
+ TrackPond[msg.Cid].Objs = nil
lock.Unlock()
} else {
lock.Lock()
- TrackPond[msg.Cid] = &PersonTrack{Faces: nil}
+ TrackPond[msg.Cid] = &PersonTrack{Objs: nil}
lock.Unlock()
logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
}
@@ -128,8 +127,8 @@
// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) {
if TrackPond[cameraId] != nil {
- logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Faces))
- for _, face := range TrackPond[cameraId].Faces {
+ logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Objs))
+ for _, face := range TrackPond[cameraId].Objs {
logger.Info("缂撳瓨涓瓨鍌ㄧ殑face鏁版嵁锛�", face.Id, face.Score)
}
faceParam := protomsg.ParamFacePos{}
@@ -147,7 +146,7 @@
}
for i := 0; i < len(faceParam.Faces); {
faceFlag := false
- for _, val := range TrackPond[cameraId].Faces {
+ for _, val := range TrackPond[cameraId].Objs {
if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿浣庯紝鏄鎶涘純鐨勬暟鎹�
faceFlag = true
//return "true"
@@ -165,7 +164,7 @@
}
if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
logger.Info("姝や汉鑴镐笉鍦ㄦ睜瀛愪腑锛屽線姹犲瓙涓坊鍔犳暟鎹洿鏂扮紦瀛�")
- TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces, &Face{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
+ TrackPond[cameraId].Objs = append(TrackPond[cameraId].Objs, &Obj{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
i++
}
}
@@ -179,10 +178,10 @@
logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
}
// 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑灏卞垹闄ゆ暟鎹洿鏂扮紦瀛�
- for i := 0; i < len(TrackPond[cameraId].Faces); {
+ for i := 0; i < len(TrackPond[cameraId].Objs); {
flag := false
for _, temp := range facesTemp {
- if TrackPond[cameraId].Faces[i].Id == temp.Pos.FaceID {
+ if TrackPond[cameraId].Objs[i].Id == temp.Pos.FaceID {
flag = true
}
}
@@ -192,13 +191,13 @@
// 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
lock.Lock()
- TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
+ TrackPond[cameraId].Objs = append(TrackPond[cameraId].Objs[:i], TrackPond[cameraId].Objs[i+1:]...)
lock.Unlock()
}
}
} else {
lock.Lock()
- TrackPond[cameraId] = &PersonTrack{Faces: nil}
+ TrackPond[cameraId] = &PersonTrack{Objs: nil}
lock.Unlock()
}
}
--
Gitblit v1.8.0