From 7a19301f6972e0b81490e57200a634e4e3731a4c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 17 十月 2024 01:42:23 +0800
Subject: [PATCH] 完善rfid读取楼层
---
repository/captureRepo.go | 150 +++++++++++++++++++++++++++++++++----------------
1 files changed, 101 insertions(+), 49 deletions(-)
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index 557ef78..bb82cf5 100644
--- a/repository/captureRepo.go
+++ b/repository/captureRepo.go
@@ -3,13 +3,14 @@
import (
"encoding/base64"
"encoding/json"
- "gat1400Exchange/pkg"
"time"
"gat1400Exchange/client"
"gat1400Exchange/config"
"gat1400Exchange/models"
+ "gat1400Exchange/pkg"
"gat1400Exchange/pkg/logger"
+ "gat1400Exchange/service"
"gat1400Exchange/util"
"gat1400Exchange/vo"
)
@@ -36,8 +37,7 @@
}
var deviceId = face.DeviceID
var faceId = face.FaceID
- var bgImageStr, imageType string
- var bgImageWidth, bgImageHeight int
+ var bgImageStr string
var bgImageBytes, faceImageBytes []byte = nil, nil
// 鑾峰彇澶у浘, 鐩墠娴峰悍鐨勫皬鍥惧垎杈ㄧ巼澶綆
@@ -46,8 +46,6 @@
continue
}
- bgImageWidth = image.Width
- bgImageHeight = image.Height
if len(image.Data) > 0 {
if len(image.Data) > len(bgImageStr) {
bgImageStr = image.Data
@@ -72,17 +70,15 @@
}
// 鍒ゆ柇鍥剧墖绫诲瀷鏄惁涓哄満鏅浘, 鏍规嵁浜鸿劯鍧愭爣鍒囧皬鍥�.
- if imageType == "14" && config.ImageConf.CutFaceImage {
- scaleX := bgImageWidth / config.ImageConf.OriginWidth
- scaleY := bgImageHeight / config.ImageConf.OriginHeight
- faceRect := &vo.Rect{
- Left: face.LeftTopX * scaleX,
- Top: face.LeftTopY * scaleY,
- Right: face.RightBtmX * scaleX,
- Bottom: face.RightBtmY * scaleY,
+ if config.ImageConf.CutFaceImage && face.LeftTopX != 0 {
+ faceRect := &pkg.Rect{
+ Left: face.LeftTopX,
+ Top: face.LeftTopY,
+ Right: face.RightBtmX,
+ Bottom: face.RightBtmY,
}
- faceImageBytes, err = util.SubCutImg(bgImageBytes, faceRect, 90)
+ faceImageBytes, err = pkg.SubCutImage(bgImageBytes, faceRect, config.ImageConf.Enlarge)
if err != nil {
logger.Warn("Cut face image failure, %s", err.Error())
}
@@ -96,16 +92,10 @@
return
}
- // 澶勭悊姊帶濉啓鐨勬ゼ灞備俊鎭� 鏆傛椂浣跨敤oherFeature瀛楁
- if face.OtherFeature != "" {
- pd.CameraFloor = face.OtherFeature
+ // 澶勭悊姊帶濉啓鐨勬ゼ灞備俊鎭� 鏆傛椂浣跨敤otherFeature瀛楁
+ if face.OtherFeature != "" && pd.CameraFloor == "" {
+ pd.Direction, pd.CameraFloor, _ = pkg.RestoreFloor(face.OtherFeature)
}
-
- // 灏濊瘯浠巉aceId鎻愬彇妤煎眰
- if pd.CameraFloor == "" && config.ClientConf.AddFloorToFaceId {
- pd.CameraFloor, _ = pkg.ParseFloorFromId(face.FaceID)
- }
- //logger.Debug("device %s, CameraFloor:%s", deviceId, pd.CameraFloor)
payload, err := json.Marshal(pd)
if err != nil {
@@ -118,7 +108,7 @@
c.CacheData(cacheItem, "basic")
logger.Warn("The data forwarding failed, adding to local cache.")
} else {
- logger.Debug("The data forwarding successful. deviceId:%s", deviceId)
+ logger.Debug("The data forwarding successful. deviceId:%s, picId:%s", deviceId, face.FaceID)
}
}
}
@@ -186,10 +176,10 @@
pd.CameraFloor = v.BehaviorDescription
}
- // 灏濊瘯浠巉aceId鎻愬彇妤煎眰
- if pd.CameraFloor == "" && config.ClientConf.AddFloorToFaceId {
- pd.CameraFloor, _ = pkg.ParseFloorFromId(v.PersonID)
- }
+ //// 灏濊瘯浠巉aceId鎻愬彇妤煎眰
+ //if pd.CameraFloor == "" && config.ClientConf.AddFloorToFaceId {
+ // pd.CameraFloor, _ = pkg.ParseFloorFromId(v.PersonID)
+ //}
//logger.Debug("device %s, CameraFloor:%s", deviceId, pd.CameraFloor)
payload, err := json.Marshal(pd)
@@ -214,6 +204,7 @@
func (c CaptureRepository) PackPushDataV2(deviceId, faceId, appearTime string, bgImgBytes, faceImgBytes []byte) *vo.PushDataInfoV2 {
var pd = new(vo.PushDataInfoV2)
var floor string
+ var runDir string
faceAppearTime, err := time.ParseInLocation("20060102150405", appearTime, time.Local)
if err != nil {
@@ -221,12 +212,31 @@
faceAppearTime = time.Now()
}
- if config.ServeConf.Role == "server" {
+ // 鍒ゆ柇鏄惁闇�瑕佸尮閰嶆ゼ灞�
+ if config.NVCSConf.Model != "" {
// 鍖归厤妤煎眰
var devPos models.Positions
_ = devPos.FindDevicePosition(deviceId, faceAppearTime.Unix()+5) // 鍔�5绉掔數姊叧闂ㄧ殑鏃堕棿
floor = devPos.Pos
+
+ for i := 0; i < config.NVCSConf.WaitRunTime; i++ {
+ var dbPos models.Positions
+ if err := dbPos.FindMovePosition(faceAppearTime.Unix()+5, floor); err == nil {
+ switch dbPos.RunDir {
+ case service.RunUp:
+ runDir = "in"
+ case service.RunDown:
+ runDir = "out"
+ case service.RunStop:
+ runDir = ""
+ }
+
+ break
+ }
+
+ time.Sleep(1 * time.Second)
+ }
}
pd.PicMaxImages = append(pd.PicMaxImages, bgImgBytes)
@@ -240,6 +250,7 @@
pd.DataSource = "camera"
pd.CameraFloor = floor
pd.CameraId = deviceId
+ pd.Direction = runDir
return pd
}
@@ -257,24 +268,50 @@
func (c CaptureRepository) VIIDFaceMsgForward(msg *vo.RequestFaceList) {
faceInfo := msg.FaceListObject.FaceObject[0]
- // 鍖归厤妤煎眰
- faceAppearTime, err := time.ParseInLocation("20060102150405", faceInfo.FaceAppearTime, time.Local)
- if err != nil {
- logger.Warn("Parse face appear time error, %s", err.Error())
- faceAppearTime = time.Now()
- }
- var devPos models.Positions
- _ = devPos.FindPositionByTime(faceAppearTime.Unix() + 5) // 鍔�5绉掔數姊叧闂ㄧ殑鏃堕棿
- if devPos.Pos == "" {
- devPos.Pos = "1F"
- }
-
- for idx, face := range msg.FaceListObject.FaceObject {
- msg.FaceListObject.FaceObject[idx].OtherFeature = devPos.Pos
- if config.ClientConf.AddFloorToFaceId {
- msg.FaceListObject.FaceObject[idx].FaceID = pkg.GenerateFaceIdContainFloor(face.FaceID, devPos.Pos)
+ // 鍒ゆ柇鏄惁寮�鍚簡姊帶
+ if config.NVCSConf.Model != "" {
+ // 鍖归厤妤煎眰
+ faceAppearTime, err := time.ParseInLocation("20060102150405", faceInfo.FaceAppearTime, time.Local)
+ if err != nil {
+ logger.Warn("Parse face appear time error, %s", err.Error())
+ faceAppearTime = time.Now()
}
+
+ var floor, runDir string
+ var devPos models.Positions
+ _ = devPos.FindPositionByTime(faceAppearTime.Unix() + 5) // 鍔�5绉掔數姊叧闂ㄧ殑鏃堕棿
+ if devPos.Pos == "" {
+ devPos.Pos = "1F"
+ }
+
+ floor = devPos.Pos
+
+ for i := 0; i < config.NVCSConf.WaitRunTime; i++ {
+ var dbPos models.Positions
+ if err := dbPos.FindMovePosition(faceAppearTime.Unix()+5, floor); err == nil {
+ switch dbPos.RunDir {
+ case service.RunUp:
+ runDir = "1"
+ case service.RunDown:
+ runDir = "2"
+ case service.RunStop:
+ runDir = "0"
+ }
+
+ break
+ }
+
+ time.Sleep(1 * time.Second)
+ }
+
+ for idx, _ := range msg.FaceListObject.FaceObject {
+ msg.FaceListObject.FaceObject[idx].OtherFeature, _ = pkg.ParseFloor(runDir, floor)
+ //if config.ClientConf.AddFloorToFaceId {
+ // msg.FaceListObject.FaceObject[idx].FaceID = pkg.GenerateFaceIdContainFloor(face.FaceID, devPos.Pos)
+ //}
+ }
+
}
b, _ := json.Marshal(msg)
@@ -302,11 +339,11 @@
devPos.Pos = "1F"
}
- for idx, v := range msg.PersonListObject.PersonObject {
+ for idx, _ := range msg.PersonListObject.PersonObject {
msg.PersonListObject.PersonObject[idx].BehaviorDescription = devPos.Pos
- if config.ClientConf.AddFloorToFaceId {
- msg.PersonListObject.PersonObject[idx].PersonID = pkg.GenerateFaceIdContainFloor(v.PersonID, devPos.Pos)
- }
+ //if config.ClientConf.AddFloorToFaceId {
+ // msg.PersonListObject.PersonObject[idx].PersonID = pkg.GenerateFaceIdContainFloor(v.PersonID, devPos.Pos)
+ //}
}
b, _ := json.Marshal(msg)
@@ -318,3 +355,18 @@
return
}
+
+func (c CaptureRepository) PubRecordMessage(deviceId, msgId string) {
+ var msg = vo.RecordMsg{
+ CamId: deviceId,
+ MsgId: msgId,
+ }
+
+ logger.Debug("Pub record message %s, %s", deviceId, msgId)
+ body, _ := json.Marshal(&msg)
+
+ _, err := util.HttpPost(config.ForwardConf.RecordServer, nil, body)
+ if err != nil {
+ logger.Warn(err.Error())
+ }
+}
--
Gitblit v1.8.0