From 3edc30421c52011b2dfe25e5fbc43a428faa6977 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 29 十一月 2019 16:08:35 +0800
Subject: [PATCH] log
---
algorithm/middleware/readyData.go | 2
ruleserver/personTrack.go | 141 +++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 130 insertions(+), 13 deletions(-)
diff --git a/algorithm/middleware/readyData.go b/algorithm/middleware/readyData.go
index 7eb4265..83f9607 100644
--- a/algorithm/middleware/readyData.go
+++ b/algorithm/middleware/readyData.go
@@ -181,7 +181,7 @@
for _, info := range plateIDResult.Result {
logger.Info("鎺ユ敹杞︾墝鏁版嵁锛�",info.FvdConf,info.NVehicleColor1,info.NPlateFlag,info.RcCarLocation)
if info.NConfidence > 70 {
- logger.Info("杞︾墝涔熺鍚堢殑鏁版嵁")
+ logger.Info("杞︾墝涔熺鍚堢殑鏁版嵁",info.FvdConf,info.NVehicleColor1,info.NPlateFlag,info.RcCarLocation,info.NConfidence,)
photoMap := structure.PhotoMap{Id: info.License,Score: float64(info.FvdConf)*100,Rects: rectFormat(info.RcCarLocation), Type: "plate", Car:info}
arg.Photo = append(arg.Photo, photoMap)
}
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index e6d1c1c..b693495 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -12,11 +12,17 @@
var lock = sync.RWMutex{}
type PersonTrack struct {
- Objs []*Obj // 浜鸿劯鐨勬暟缁�
+ Faces []*Face // 浜鸿劯鐨勬暟缁�
+ Cars []*Car // 杞﹁締鐨勬暟缁�
Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
}
-type Obj struct {
+type Face struct {
Id uint64
+ Score float32
+}
+
+type Car struct {
+ Id string // 杞︾墝
Score float32
}
@@ -38,11 +44,11 @@
if TrackPond[msg.Cid] != nil {
logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
lock.Lock()
- TrackPond[msg.Cid].Objs = nil
+ TrackPond[msg.Cid].Faces = nil
lock.Unlock()
} else {
lock.Lock()
- TrackPond[msg.Cid] = &PersonTrack{Objs: nil}
+ TrackPond[msg.Cid] = &PersonTrack{Faces: nil}
lock.Unlock()
logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
}
@@ -127,8 +133,8 @@
// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) {
if TrackPond[cameraId] != nil {
- logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Objs))
- for _, face := range TrackPond[cameraId].Objs {
+ logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Faces))
+ for _, face := range TrackPond[cameraId].Faces {
logger.Info("缂撳瓨涓瓨鍌ㄧ殑face鏁版嵁锛�", face.Id, face.Score)
}
faceParam := protomsg.ParamFacePos{}
@@ -146,7 +152,7 @@
}
for i := 0; i < len(faceParam.Faces); {
faceFlag := false
- for _, val := range TrackPond[cameraId].Objs {
+ for _, val := range TrackPond[cameraId].Faces {
if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿浣庯紝鏄鎶涘純鐨勬暟鎹�
faceFlag = true
//return "true"
@@ -164,7 +170,7 @@
}
if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
logger.Info("姝や汉鑴镐笉鍦ㄦ睜瀛愪腑锛屽線姹犲瓙涓坊鍔犳暟鎹洿鏂扮紦瀛�")
- TrackPond[cameraId].Objs = append(TrackPond[cameraId].Objs, &Obj{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
+ TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces, &Face{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
i++
}
}
@@ -178,10 +184,10 @@
logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
}
// 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑灏卞垹闄ゆ暟鎹洿鏂扮紦瀛�
- for i := 0; i < len(TrackPond[cameraId].Objs); {
+ for i := 0; i < len(TrackPond[cameraId].Faces); {
flag := false
for _, temp := range facesTemp {
- if TrackPond[cameraId].Objs[i].Id == temp.Pos.FaceID {
+ if TrackPond[cameraId].Faces[i].Id == temp.Pos.FaceID {
flag = true
}
}
@@ -191,13 +197,124 @@
// 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
lock.Lock()
- TrackPond[cameraId].Objs = append(TrackPond[cameraId].Objs[:i], TrackPond[cameraId].Objs[i+1:]...)
+ TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
lock.Unlock()
}
}
} else {
lock.Lock()
- TrackPond[cameraId] = &PersonTrack{Objs: nil}
+ TrackPond[cameraId] = &PersonTrack{Faces: nil}
lock.Unlock()
}
}
+
+// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
+func CarIsSame(msg *protomsg.SdkMessage) {
+ logger.Debug("+++++++++++++++++++++杞﹁締杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+ for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
+ if sdkinfo.Sdktype == "Plate" { // 浜鸿劯妫�娴�
+ if len(sdkinfo.Sdkdata) > 1 {
+ num = 25
+ FaceIsInPond(msg.Cid, sdkinfo)
+ } else {
+ if num > 0 { // 杩炵画num娆℃病鏈夋暟鎹墠绠楁槸娌℃湁鏁版嵁锛屼笉鐒跺彧绠椾綔涓㈠抚
+ logger.Info("鎴戣涓轰綘鍙槸涓㈠抚浜�,姝ゆ椂鐨刵um鍊间负锛�", num)
+ num--
+ } else {
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
+ lock.Lock()
+ TrackPond[msg.Cid].Cars = nil
+ lock.Unlock()
+ } else {
+ lock.Lock()
+ TrackPond[msg.Cid] = &PersonTrack{Cars: nil}
+ lock.Unlock()
+ logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
+ }
+ logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁杞﹁締锛岃閲嶇疆涓虹┖")
+ continue
+ }
+ }
+ }
+ }
+ logger.Debug("--------------------------------杞﹁締杩借釜缁撴潫--------------------------------------")
+}
+
+
+//func CarIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) {
+// if TrackPond[cameraId] != nil {
+// logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Cars))
+// for _, car := range TrackPond[cameraId].Cars {
+// logger.Info("缂撳瓨涓瓨鍌ㄧ殑face鏁版嵁锛�", car.Id, car.Score)
+// }
+// carParam := protomsg.PlateIDResult{}
+// err := proto.Unmarshal(sdkinfor.Sdkdata, &carParam)
+// if err != nil {
+// logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+// }
+// logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(carParam.Result))
+// for _, res := range carParam.Result {
+// logger.Info("鏂版潵鐨勭殑car鏁版嵁锛�", res.License, res.FvdConf)
+// }
+// var facesTemp []protomsg.ResultFaceDetect
+// for _, face := range faceParam.Faces {
+// facesTemp = append(facesTemp, *face) // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
+// }
+// for i := 0; i < len(faceParam.Faces); {
+// faceFlag := false
+// for _, val := range TrackPond[cameraId].Faces {
+// if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿浣庯紝鏄鎶涘純鐨勬暟鎹�
+// faceFlag = true
+// //return "true"
+// logger.Info("鍒嗗�间负锛�", faceParam.Faces[i].Pos.FAngle.Confidence, "--缂撳瓨鐨勫垎鍊间负锛�", val.Score, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿浣庯紝鏄琚姏寮冪殑鏁版嵁")
+// faceParam.Faces = append(faceParam.Faces[:i], faceParam.Faces[i+1:]...)
+// break
+// }
+// if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence > val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿楂橈紝鏇存柊缂撳瓨
+// faceFlag = true
+// logger.Info("鍒嗗�肩敱", val.Score, "鏇存柊涓猴細", faceParam.Faces[i].Pos.FAngle.Confidence, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿楂橈紝鏄琚紶閫掍笅鍘荤殑鏁版嵁")
+// lock.Lock()
+// val.Score = faceParam.Faces[i].Pos.FAngle.Confidence
+// lock.Unlock()
+// }
+// }
+// if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
+// logger.Info("姝や汉鑴镐笉鍦ㄦ睜瀛愪腑锛屽線姹犲瓙涓坊鍔犳暟鎹洿鏂扮紦瀛�")
+// TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces, &Face{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
+// i++
+// }
+// }
+// logger.Info("鍙嶅簭鍒楀寲閲嶆柊瑁呴厤涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
+// logger.Info("涓存椂瀛樺偍鐨勬柊鏉ユ暟鎹細")
+// for _, temp := range facesTemp {
+// logger.Info("涓存椂瀛樺偍鐨勬柊鏉ョ殑鐨刦ace鏁版嵁锛�", temp.Pos.FaceID, temp.Pos.FAngle.Confidence)
+// }
+// sdkinfor.Sdkdata, err = proto.Marshal(&faceParam)
+// if err != nil {
+// logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
+// }
+// // 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑灏卞垹闄ゆ暟鎹洿鏂扮紦瀛�
+// for i := 0; i < len(TrackPond[cameraId].Faces); {
+// flag := false
+// for _, temp := range facesTemp {
+// if TrackPond[cameraId].Faces[i].Id == temp.Pos.FaceID {
+// flag = true
+// }
+// }
+// if flag {
+// i++
+// } else {
+// // 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
+// logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
+// lock.Lock()
+// TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
+// lock.Unlock()
+// }
+// }
+// } else {
+// lock.Lock()
+// TrackPond[cameraId] = &PersonTrack{Faces: nil}
+// lock.Unlock()
+// }
+//}
\ No newline at end of file
--
Gitblit v1.8.0