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 | 200 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 150 insertions(+), 50 deletions(-)
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index 027172f..c5516e1 100644
--- a/repository/captureRepo.go
+++ b/repository/captureRepo.go
@@ -1,15 +1,15 @@
package repository
import (
- "bytes"
"encoding/base64"
"encoding/json"
- "net/http"
+ "gat1400Exchange/client"
"time"
"gat1400Exchange/config"
"gat1400Exchange/models"
"gat1400Exchange/pkg/logger"
+ "gat1400Exchange/util"
"gat1400Exchange/vo"
uuid "github.com/satori/go.uuid"
@@ -23,8 +23,10 @@
}
func (c CaptureRepository) FaceForward(faceList []vo.FaceObject) {
+ var err error
+
if faceList == nil || len(faceList) == 0 {
- logger.Warn("faceList is nil")
+ logger.Warn("FaceList is nil")
return
}
@@ -36,28 +38,65 @@
var deviceId = face.DeviceID
var faceId = face.FaceID
- var faceImageStr string
+ var bgImageStr, imageType string
+ var bgImageBytes, faceImageBytes []byte = nil, nil
// 鑾峰彇澶у浘, 鐩墠娴峰悍鐨勫皬鍥惧垎杈ㄧ巼澶綆
for _, image := range face.SubImageList.SubImageInfoObject {
- if len(image.Data) > len(faceImageStr) {
- faceImageStr = image.Data
+ if len(image.Data) > len(bgImageStr) {
+ bgImageStr = image.Data
+ imageType = image.Type
+ }
+ }
+
+ 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{
+ Left: face.LeftTopX,
+ Top: face.LeftTopY,
+ Right: face.RightBtmX,
+ Bottom: face.RightBtmY,
+ }
+
+ faceImageBytes, err = util.SubCutImg(bgImageBytes, faceRect, 90)
+ if err != nil {
+ logger.Warn("Cut face image failure, %s", err.Error())
}
}
// 杞彂鍥惧儚
- logger.Debug("鍑嗗杞彂,deviceId:%s, image len:%d, server:%s", deviceId, len(faceImageStr), config.ForwardConf.SyncServer)
- if deviceId != "" && faceImageStr != "" && config.ForwardConf.SyncServer != "" {
- pd := c.PackPushData(deviceId, faceId, faceImageStr)
+ logger.Debug("Prepare forward image, deviceId:%s, image len:%d, server:%s", deviceId, len(bgImageStr), config.ForwardConf.SyncServer)
+ if deviceId != "" && bgImageStr != "" && config.ForwardConf.SyncServer != "" {
+ pd := c.PackPushDataV2(deviceId, faceId, face.FaceAppearTime, bgImageBytes, faceImageBytes)
if pd == nil {
return
}
- rsp, err := c.SendData(pd, config.ForwardConf.SyncServer)
+ // 閮ㄧ讲鍦ㄦ湇鍔＄鐨�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("鏁版嵁杞彂澶辫触:%s", err.Error())
+ logger.Warn("Marshal error, %s", err.Error())
+ return
+ }
+
+ if !util.SendData(payload, config.ForwardConf.SyncServer) {
+ cacheItem, _ := json.Marshal(pd)
+ c.CacheData(cacheItem, "basic")
+ logger.Warn("The data forwarding failed, adding to local cache.")
} else {
- logger.Debug("鏁版嵁杞彂鎴愬姛,id:%s", rsp)
+ logger.Debug("The data forwarding successful. deviceId:%s", deviceId)
}
}
}
@@ -65,38 +104,49 @@
return
}
-func (c CaptureRepository) PackPushData(deviceId, faceId, faceImage string) *vo.PushDataInfo {
+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.Debug("Can't find device in database, device:%s, %s", deviceId, err.Error())
+ 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())
+ 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,
- OrgName: "",
- CameraAddr: device.Addr + device.Pos,
- CameraName: device.Name,
- PicMaxUrl: []string{""},
- PicDate: time.Now().Format("2006-01-02 15:04:05"),
- LikeDate: time.Now().Format("2006-01-02 15:04:05"),
- TaskId: "",
- AnalyServerId: deviceId,
- AnalyServerName: "",
- AnalyServerIp: "",
- DataSource: "camera",
- TargetInfo: []vo.TargetInfo{{TargetId: faceId}},
+ 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{
@@ -108,35 +158,85 @@
return pd
}
-func (c CaptureRepository) SendData(pushDataInfo *vo.PushDataInfo, url string) (id string, err error) {
- id = ""
- payload, err := json.Marshal(pushDataInfo)
+func (c CaptureRepository) PackPushDataV2(deviceId, faceId, appearTime string, bgImgBytes, faceImgBytes []byte) *vo.PushDataInfoV2 {
+ var pd = new(vo.PushDataInfoV2)
+ var floor string
+
+ faceAppearTime, err := time.ParseInLocation("20060102150405", appearTime, time.Local)
if err != nil {
- return id, err
+ logger.Warn("Parse face appear time error, %s", err.Error())
+ faceAppearTime = time.Now()
}
- req, err := http.NewRequest("POST", url, bytes.NewBuffer(payload))
- if err != nil {
- return id, err
+ 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
}
- client := &http.Client{}
- resp, err := client.Do(req)
- if err != nil {
- return id, err
- }
- defer resp.Body.Close()
+ pd.PicMaxImages = append(pd.PicMaxImages, bgImgBytes)
- var responseData map[string]interface{}
- err = json.NewDecoder(resp.Body).Decode(&responseData)
- if err != nil {
- return id, err
+ if faceImgBytes != nil {
+ pd.PicSmImages = append(pd.PicSmImages, faceImgBytes)
}
- id = responseData["data"].(string)
- // 澶勭悊鍝嶅簲
- // 杩欓噷鍙互鏍规嵁瀹為檯闇�姹傝繘琛屽鐞嗭紝渚嬪璇诲彇鍝嶅簲鍐呭鎴栨鏌ョ姸鎬佺爜绛�
+ pd.PicId = faceId
+ pd.PicDate = faceAppearTime.Format("2006-01-02 15:04:05")
+ pd.DataSource = "camera"
+ pd.CameraFloor = floor
+ pd.CameraId = deviceId
- return id, nil
+ return pd
+}
+func (c CaptureRepository) CacheData(payload []byte, msgType string) {
+ var cacheItem = models.Cache{
+ Type: msgType,
+ Data: string(payload),
+ CreateTime: time.Now().Unix(),
+ Retry: 0,
+ }
+
+ 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