From 90ebf117a7e1ccf630361fe0f66289563b1eeb25 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期六, 18 五月 2024 11:48:43 +0800
Subject: [PATCH] 修复设备类型缓存的使用
---
repository/captureRepo.go | 107 +++++++++++++----------------------------------------
1 files changed, 27 insertions(+), 80 deletions(-)
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index cddc2a6..1c33540 100644
--- a/repository/captureRepo.go
+++ b/repository/captureRepo.go
@@ -3,16 +3,14 @@
import (
"encoding/base64"
"encoding/json"
- "gat1400Exchange/client"
"time"
+ "gat1400Exchange/client"
"gat1400Exchange/config"
"gat1400Exchange/models"
"gat1400Exchange/pkg/logger"
"gat1400Exchange/util"
"gat1400Exchange/vo"
-
- uuid "github.com/satori/go.uuid"
)
type CaptureRepository struct {
@@ -43,16 +41,31 @@
// 鑾峰彇澶у浘, 鐩墠娴峰悍鐨勫皬鍥惧垎杈ㄧ巼澶綆
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 := util.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
+ }
}
// 鍒ゆ柇鍥剧墖绫诲瀷鏄惁涓哄満鏅浘, 鏍规嵁浜鸿劯鍧愭爣鍒囧皬鍥�.
@@ -71,18 +84,16 @@
}
// 杞彂鍥惧儚
- 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, image len:%d, server:%s", deviceId, len(bgImageBytes), config.ForwardConf.SyncServer)
if deviceId != "" && bgImageStr != "" && config.ForwardConf.SyncServer != "" {
pd := c.PackPushDataV2(deviceId, faceId, face.FaceAppearTime, bgImageBytes, faceImageBytes)
if pd == nil {
return
}
- // 閮ㄧ讲鍦ㄦ湇鍔＄鐨�1400浠ｇ悊, 浠呮帴鏀�1400淇℃伅, 妤煎眰淇℃伅鏆傚瓨鍦╫herFeature瀛楁
- if config.ServeConf.Role == "proxy" {
- if face.OtherFeature != "" {
- pd.CameraFloor = face.OtherFeature
- }
+ // 澶勭悊姊帶濉啓鐨勬ゼ灞備俊鎭� 鏆傛椂浣跨敤oherFeature瀛楁
+ if face.OtherFeature != "" {
+ pd.CameraFloor = face.OtherFeature
}
payload, err := json.Marshal(pd)
@@ -104,60 +115,6 @@
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
@@ -169,19 +126,9 @@
}
if config.ServeConf.Role == "server" {
- 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
- }
-
// 鍖归厤妤煎眰
var devPos models.Positions
_ = devPos.FindDevicePosition(deviceId, faceAppearTime.Unix()+5) // 鍔�5绉掔數姊叧闂ㄧ殑鏃堕棿
- if devPos.Pos == "" {
- devPos.Pos = device.Floor
- }
floor = devPos.Pos
}
--
Gitblit v1.8.0