From 2c77f012601b7788dc58b0c9fd99aad587983b0d Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 22 十月 2024 21:20:19 +0800
Subject: [PATCH] 完善楼层相关操作
---
repository/captureRepo.go | 311 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 205 insertions(+), 106 deletions(-)
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index cddc2a6..87ae032 100644
--- a/repository/captureRepo.go
+++ b/repository/captureRepo.go
@@ -3,16 +3,16 @@
import (
"encoding/base64"
"encoding/json"
- "gat1400Exchange/client"
"time"
+ "gat1400Exchange/client"
"gat1400Exchange/config"
"gat1400Exchange/models"
+ "gat1400Exchange/nvcs"
+ "gat1400Exchange/pkg"
"gat1400Exchange/pkg/logger"
"gat1400Exchange/util"
"gat1400Exchange/vo"
-
- uuid "github.com/satori/go.uuid"
)
type CaptureRepository struct {
@@ -35,55 +35,152 @@
logger.Warn("SubImageInfoObject is nil")
continue
}
-
var deviceId = face.DeviceID
var faceId = face.FaceID
- var bgImageStr, imageType string
+ var bgImageStr string
var bgImageBytes, faceImageBytes []byte = nil, nil
// 鑾峰彇澶у浘, 鐩墠娴峰悍鐨勫皬鍥惧垎杈ㄧ巼澶綆
for _, image := range face.SubImageList.SubImageInfoObject {
- if len(image.Data) > len(bgImageStr) {
- bgImageStr = image.Data
- imageType = image.Type
+ if image.Type != "14" {
+ continue
+ }
+
+ if len(image.Data) > 0 {
+ if len(image.Data) > len(bgImageStr) {
+ bgImageStr = image.Data
+ }
+ } else if image.StoragePath != "" {
+ imgData, err := pkg.ImageDownload(image.StoragePath, nil)
+ if err != nil {
+ logger.Warn("Image download failure, %s", err.Error())
+ } else {
+ bgImageBytes = imgData
+ bgImageStr = "///"
+ }
}
}
- bgImageBytes, err = base64.StdEncoding.DecodeString(bgImageStr)
- if err != nil {
- logger.Warn("Decode Image Base64 String failure, %s", err.Error())
- continue
+ if bgImageBytes == nil {
+ bgImageBytes, err = base64.StdEncoding.DecodeString(bgImageStr)
+ if err != nil {
+ logger.Warn("Decode Image Base64 String failure, %s", err.Error())
+ continue
+ }
}
// 鍒ゆ柇鍥剧墖绫诲瀷鏄惁涓哄満鏅浘, 鏍规嵁浜鸿劯鍧愭爣鍒囧皬鍥�.
- if imageType == "14" && config.ForwardConf.CutFaceImage {
- faceRect := &vo.Rect{
+ 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())
}
}
// 杞彂鍥惧儚
- logger.Debug("Prepare forward image, deviceId:%s, image len:%d, server:%s", deviceId, len(bgImageStr), config.ForwardConf.SyncServer)
+ logger.Debug("Prepare forward image, deviceId:%s, bgImage len:%d, smImage len:%d server:%s", deviceId, len(bgImageBytes), len(faceImageBytes), config.ForwardConf.SyncServer)
if deviceId != "" && bgImageStr != "" && config.ForwardConf.SyncServer != "" {
- pd := c.PackPushDataV2(deviceId, faceId, face.FaceAppearTime, bgImageBytes, faceImageBytes)
+ pushData := c.PackPushDataV2(deviceId, faceId, face.FaceAppearTime, bgImageBytes, faceImageBytes)
+ if pushData == nil {
+ return
+ }
+
+ // 澶勭悊姊帶濉啓鐨勬ゼ灞備俊鎭� 鏆傛椂浣跨敤otherFeature瀛楁
+ if face.OtherFeature != "" && pushData.CameraFloor == "" {
+ pushData.Direction, pushData.CameraFloor, _ = pkg.RestoreFloor(face.OtherFeature)
+ }
+
+ payload, err := json.Marshal(pushData)
+ if err != nil {
+ logger.Warn("Marshal error, %s", err.Error())
+ return
+ }
+
+ if !pkg.SendData(payload, config.ForwardConf.SyncServer) {
+ cacheItem, _ := json.Marshal(pushData)
+ c.CacheData(cacheItem, "basic")
+ logger.Warn("The data forwarding failed, adding to local cache.")
+ } else {
+ logger.Debug("The data forwarding successful. deviceId:%s, picId:%s", deviceId, face.FaceID)
+ }
+ }
+ }
+
+ return
+}
+
+func (c CaptureRepository) PersonForward(personList []vo.PersonObject) {
+ var err error
+
+ if personList == nil || len(personList) == 0 {
+ logger.Warn("FaceList is nil")
+ return
+ }
+
+ for _, v := range personList {
+ if v.SubImageList.SubImageInfoObject == nil {
+ logger.Warn("SubImageInfoObject is nil")
+ continue
+ }
+ var deviceId = v.DeviceID
+ var targetId = v.PersonID
+ var bgImageStr string
+ var bgImageBytes, faceImageBytes []byte = nil, nil
+
+ // 鑾峰彇澶у浘, 鐩墠娴峰悍鐨勫皬鍥惧垎杈ㄧ巼澶綆
+ for _, image := range v.SubImageList.SubImageInfoObject {
+ if image.Type != "14" {
+ continue
+ }
+
+ if len(image.Data) > 0 {
+ if len(image.Data) > len(bgImageStr) {
+ bgImageStr = image.Data
+ }
+ } else if image.StoragePath != "" {
+ imgData, err := pkg.ImageDownload(image.StoragePath, nil)
+ if err != nil {
+ logger.Warn("Image download failure, %s", err.Error())
+ } else {
+ bgImageBytes = imgData
+ bgImageStr = "///"
+ }
+ }
+ }
+
+ if bgImageBytes == nil {
+ bgImageBytes, err = base64.StdEncoding.DecodeString(bgImageStr)
+ if err != nil {
+ logger.Warn("Decode Image Base64 String failure, %s", err.Error())
+ continue
+ }
+ }
+
+ // 杞彂鍥惧儚
+ logger.Debug("Prepare forward person image, deviceId:%s, image len:%d, server:%s", deviceId, len(bgImageBytes), config.ForwardConf.SyncServer)
+ if deviceId != "" && bgImageStr != "" && config.ForwardConf.SyncServer != "" {
+ pd := c.PackPushDataV2(deviceId, targetId, v.PersonAppearTime, bgImageBytes, faceImageBytes)
if pd == nil {
return
}
- // 閮ㄧ讲鍦ㄦ湇鍔＄鐨�1400浠ｇ悊, 浠呮帴鏀�1400淇℃伅, 妤煎眰淇℃伅鏆傚瓨鍦╫herFeature瀛楁
- if config.ServeConf.Role == "proxy" {
- if face.OtherFeature != "" {
- pd.CameraFloor = face.OtherFeature
- }
+ // 澶勭悊姊帶濉啓鐨勬ゼ灞備俊鎭� 鏆傛椂浣跨敤oherFeature瀛楁
+ if v.BehaviorDescription != "" {
+ pd.CameraFloor = v.BehaviorDescription
}
+
+ //// 灏濊瘯浠巉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)
if err != nil {
@@ -91,7 +188,7 @@
return
}
- if !util.SendData(payload, config.ForwardConf.SyncServer) {
+ if !pkg.SendData(payload, config.ForwardConf.SyncServer) {
cacheItem, _ := json.Marshal(pd)
c.CacheData(cacheItem, "basic")
logger.Warn("The data forwarding failed, adding to local cache.")
@@ -104,63 +201,10 @@
return
}
-func (c CaptureRepository) PackPushData(deviceId, faceId, faceImage, appearTime string) *vo.PushDataInfo {
- var pd = new(vo.PushDataInfo)
- var device models.Device
-
- if err := device.FindById(deviceId); err != nil {
- logger.Warn("Can't find device in database, device:%s, %s", deviceId, err.Error())
- return pd
- }
-
- // 鍖归厤妤煎眰
- faceAppearTime, err := time.ParseInLocation("20060102150405", appearTime, time.Local)
- if err != nil {
- logger.Warn("Parse face appear time error, %s", err.Error())
- faceAppearTime = time.Now()
- }
-
- // 鐢垫鍋滄鐨勬椂闂�
- devStopTime := time.Now().Format("2006-01-02 15:04:05")
- var devPos models.Positions
- _ = devPos.FindDevicePosition(deviceId, faceAppearTime.Unix()+5) // 鍔�5绉掔數姊叧闂ㄧ殑鏃堕棿
- if devPos.TimeString != "" {
- devStopTime = devPos.TimeString
- }
-
- imageBytes, err := base64.StdEncoding.DecodeString(faceImage)
- if err != nil {
- logger.Warn("Decode Image Base64 String failure, %s", err.Error())
- return pd
- }
-
- pd.PicMaxImages = append(pd.PicMaxImages, imageBytes)
-
- tr := vo.TaskResultInfo{
- Id: uuid.NewV4().String(),
- CameraId: deviceId,
- CameraAddr: device.Addr + devPos.Pos,
- CameraName: device.Name,
- PicMaxUrl: []string{""},
- PicDate: faceAppearTime.Format("2006-01-02 15:04:05"),
- LikeDate: devStopTime,
- AnalyServerId: deviceId,
- DataSource: "camera",
- TargetInfo: []vo.TargetInfo{{TargetId: faceId}},
- }
-
- pd.SourceData = vo.ESInfo{
- TaskResultInfo: tr,
- Version: "3.3",
- UpdateTime: time.Now().Format("2006-01-02 15:04:05"),
- }
-
- return pd
-}
-
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 {
@@ -168,22 +212,19 @@
faceAppearTime = time.Now()
}
- if config.ServeConf.Role == "server" {
- var device models.Device
+ // 鍒ゆ柇鏄惁闇�瑕佸尮閰嶆ゼ灞�
+ if config.NVCSConf.Model != "" {
+ runState := nvcs.FindPositionByTime(faceAppearTime.Unix() + 3) // 鍔�3绉掔數姊叧闂ㄧ殑鏃堕棿
+ floor = runState.Floor
- if err := device.FindById(deviceId); err != nil {
- logger.Warn("Can't find device in database, device:%s, %s", deviceId, err.Error())
- return pd
+ for i := 0; i < config.NVCSConf.WaitRunTime; i++ {
+ if runState = nvcs.CurrentRunState(); runState.Floor != "" && runState.Floor != floor {
+ runDir = pkg.CheckDirection(floor, runState.Floor)
+ break
+ }
+
+ time.Sleep(1 * time.Second)
}
-
- // 鍖归厤妤煎眰
- var devPos models.Positions
- _ = devPos.FindDevicePosition(deviceId, faceAppearTime.Unix()+5) // 鍔�5绉掔數姊叧闂ㄧ殑鏃堕棿
- if devPos.Pos == "" {
- devPos.Pos = device.Floor
- }
-
- floor = devPos.Pos
}
pd.PicMaxImages = append(pd.PicMaxImages, bgImgBytes)
@@ -197,6 +238,7 @@
pd.DataSource = "camera"
pd.CameraFloor = floor
pd.CameraId = deviceId
+ pd.Direction = runDir
return pd
}
@@ -212,31 +254,88 @@
cacheItem.Save()
}
-func (c CaptureRepository) VIIDMsgForward(msg *vo.RequestFaceList) {
+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 floor, runDir string
- var devPos models.Positions
- _ = devPos.FindPositionByTime(faceAppearTime.Unix() + 5) // 鍔�5绉掔數姊叧闂ㄧ殑鏃堕棿
- if devPos.Pos == "" {
- devPos.Pos = "1F"
- }
+ // 鍒ゆ柇鏄惁寮�鍚簡姊帶
+ 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()
+ }
- for idx, _ := range msg.FaceListObject.FaceObject {
- msg.FaceListObject.FaceObject[idx].OtherFeature = devPos.Pos
+ runState := nvcs.FindPositionByTime(faceAppearTime.Unix() + 3) // 鍔�3绉掔數姊叧闂ㄧ殑鏃堕棿
+ floor = runState.Floor
+
+ for i := 0; i < config.NVCSConf.WaitRunTime; i++ {
+ if runState = nvcs.CurrentRunState(); runState.Floor != "" && runState.Floor != floor {
+ runDir = pkg.CheckDirection(floor, runState.Floor)
+ break
+ }
+
+ time.Sleep(1 * time.Second)
+ }
+
+ for idx, _ := range msg.FaceListObject.FaceObject {
+ msg.FaceListObject.FaceObject[idx].OtherFeature, _ = pkg.BuildFloorString(runDir, floor)
+ //if config.ClientConf.AddFloorToFaceId {
+ // msg.FaceListObject.FaceObject[idx].FaceID = pkg.GenerateFaceIdContainFloor(face.FaceID, devPos.Pos)
+ //}
+ }
}
b, _ := json.Marshal(msg)
if client.FaceCapture(b) != vo.StatusSuccess {
cacheItem, _ := json.Marshal(msg)
- c.CacheData(cacheItem, "1400")
+ c.CacheData(cacheItem, "1400-face")
logger.Warn("The data forwarding failed, adding to local cache.")
}
return
}
+
+func (c CaptureRepository) VIIDPersonMsgForward(msg *vo.RequestPersonList) {
+ person := msg.PersonListObject.PersonObject[0]
+ // 鍖归厤妤煎眰
+ appearTime, err := time.ParseInLocation("20060102150405", person.PersonAppearTime, time.Local)
+ if err != nil {
+ logger.Warn("Parse face appear time error, %s", err.Error())
+ appearTime = time.Now()
+ }
+
+ runState := nvcs.FindPositionByTime(appearTime.Unix() + 3) // 鍔�3绉掔數姊叧闂ㄧ殑鏃堕棿
+
+ for idx, _ := range msg.PersonListObject.PersonObject {
+ msg.PersonListObject.PersonObject[idx].BehaviorDescription = runState.Floor
+ //if config.ClientConf.AddFloorToFaceId {
+ // msg.PersonListObject.PersonObject[idx].PersonID = pkg.GenerateFaceIdContainFloor(v.PersonID, devPos.Pos)
+ //}
+ }
+
+ b, _ := json.Marshal(msg)
+ if client.PersonCapture(b) != vo.StatusSuccess {
+ cacheItem, _ := json.Marshal(msg)
+ c.CacheData(cacheItem, "1400-person")
+ logger.Warn("The data forwarding failed, adding to local cache.")
+ }
+
+ 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 := pkg.HttpPost(config.ForwardConf.RecordServer, nil, body)
+ if err != nil {
+ logger.Warn(err.Error())
+ }
+}
--
Gitblit v1.8.0