From 5abbb114d703b40d2a42e9e3eecdadcb6d341dcf Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 29 四月 2024 03:51:11 +0800
Subject: [PATCH] 修复keepalive地址
---
repository/captureRepo.go | 72 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 14 deletions(-)
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index 15f4c34..c5516e1 100644
--- a/repository/captureRepo.go
+++ b/repository/captureRepo.go
@@ -3,6 +3,7 @@
import (
"encoding/base64"
"encoding/json"
+ "gat1400Exchange/client"
"time"
"gat1400Exchange/config"
@@ -77,6 +78,13 @@
return
}
+ // 閮ㄧ讲鍦ㄦ湇鍔＄鐨�1400浠ｇ悊, 浠呮帴鏀�1400淇℃伅, 妤煎眰淇℃伅鏆傚瓨鍦╫herFeature瀛楁
+ if config.ServeConf.Role == "proxy" {
+ if face.OtherFeature != "" {
+ pd.CameraFloor = face.OtherFeature
+ }
+ }
+
payload, err := json.Marshal(pd)
if err != nil {
logger.Warn("Marshal error, %s", err.Error())
@@ -85,7 +93,7 @@
if !util.SendData(payload, config.ForwardConf.SyncServer) {
cacheItem, _ := json.Marshal(pd)
- c.CacheData(cacheItem)
+ c.CacheData(cacheItem, "basic")
logger.Warn("The data forwarding failed, adding to local cache.")
} else {
logger.Debug("The data forwarding successful. deviceId:%s", deviceId)
@@ -152,24 +160,30 @@
func (c CaptureRepository) PackPushDataV2(deviceId, faceId, appearTime string, bgImgBytes, faceImgBytes []byte) *vo.PushDataInfoV2 {
var pd = new(vo.PushDataInfoV2)
- var device models.Device
+ var floor string
- 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()
}
- var devPos models.Positions
- _ = devPos.FindDevicePosition(deviceId, faceAppearTime.Unix()+5) // 鍔�5绉掔數姊叧闂ㄧ殑鏃堕棿
- if devPos.Pos == "" {
- devPos.Pos = device.Floor
+ 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
}
pd.PicMaxImages = append(pd.PicMaxImages, bgImgBytes)
@@ -181,14 +195,15 @@
pd.PicId = faceId
pd.PicDate = faceAppearTime.Format("2006-01-02 15:04:05")
pd.DataSource = "camera"
- pd.CameraFloor = devPos.Pos
+ pd.CameraFloor = floor
pd.CameraId = deviceId
return pd
}
-func (c CaptureRepository) CacheData(payload []byte) {
+func (c CaptureRepository) CacheData(payload []byte, msgType string) {
var cacheItem = models.Cache{
+ Type: msgType,
Data: string(payload),
CreateTime: time.Now().Unix(),
Retry: 0,
@@ -196,3 +211,32 @@
cacheItem.Save()
}
+
+func (c CaptureRepository) MsgForward(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, _ := range msg.FaceListObject.FaceObject {
+ msg.FaceListObject.FaceObject[idx].OtherFeature = devPos.Pos
+ }
+
+ b, _ := json.Marshal(msg)
+ if client.FaceCapture(b) != vo.StatusSuccess {
+ cacheItem, _ := json.Marshal(msg)
+ c.CacheData(cacheItem, "1400")
+ logger.Warn("The data forwarding failed, adding to local cache.")
+ }
+
+ return
+}
--
Gitblit v1.8.0