From 4cb74495ff756ac97f3ce6a846951f4bdb317aec Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 20 六月 2024 19:09:31 +0800
Subject: [PATCH] 添加大图转url
---
repository/captureRepo.go | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index 559a6b7..7943cc6 100644
--- a/repository/captureRepo.go
+++ b/repository/captureRepo.go
@@ -93,7 +93,7 @@
// 澶勭悊姊帶濉啓鐨勬ゼ灞備俊鎭� 鏆傛椂浣跨敤otherFeature瀛楁
if face.OtherFeature != "" {
- pd.CameraFloor = face.OtherFeature
+ pd.CameraFloor, _ = pkg.RestoreFloor(face.OtherFeature)
}
// 灏濊瘯浠巉aceId鎻愬彇妤煎眰
@@ -113,7 +113,7 @@
c.CacheData(cacheItem, "basic")
logger.Warn("The data forwarding failed, adding to local cache.")
} else {
- logger.Debug("The data forwarding successful. deviceId:%s, picId:", deviceId, face.FaceID)
+ logger.Debug("The data forwarding successful. deviceId:%s, picId:%s", deviceId, face.FaceID)
}
}
}
@@ -252,24 +252,29 @@
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 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, _ = pkg.ParseFloor(devPos.Pos)
+ if config.ClientConf.AddFloorToFaceId {
+ msg.FaceListObject.FaceObject[idx].FaceID = pkg.GenerateFaceIdContainFloor(face.FaceID, devPos.Pos)
+ }
+ }
+
}
b, _ := json.Marshal(msg)
--
Gitblit v1.8.0