From b5166ec34cea995536384391712373f1d0d69e28 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 28 五月 2024 17:53:25 +0800
Subject: [PATCH] 修改新 face id 格式
---
repository/captureRepo.go | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index 1c33540..57f5e23 100644
--- a/repository/captureRepo.go
+++ b/repository/captureRepo.go
@@ -3,6 +3,7 @@
import (
"encoding/base64"
"encoding/json"
+ "gat1400Exchange/pkg"
"time"
"gat1400Exchange/client"
@@ -33,7 +34,6 @@
logger.Warn("SubImageInfoObject is nil")
continue
}
-
var deviceId = face.DeviceID
var faceId = face.FaceID
var bgImageStr, imageType string
@@ -95,6 +95,12 @@
if face.OtherFeature != "" {
pd.CameraFloor = face.OtherFeature
}
+
+ // 灏濊瘯浠巉aceId鎻愬彇妤煎眰
+ if pd.CameraFloor == "" {
+ pd.CameraFloor, _ = pkg.ParseFloorFromId(face.FaceID)
+ }
+ //logger.Debug("device %s, CameraFloor:%s", deviceId, pd.CameraFloor)
payload, err := json.Marshal(pd)
if err != nil {
@@ -174,8 +180,9 @@
devPos.Pos = "1F"
}
- for idx, _ := range msg.FaceListObject.FaceObject {
+ for idx, face := range msg.FaceListObject.FaceObject {
msg.FaceListObject.FaceObject[idx].OtherFeature = devPos.Pos
+ msg.FaceListObject.FaceObject[idx].FaceID = pkg.GenerateFaceIdContainFloor(face.FaceID, devPos.Pos)
}
b, _ := json.Marshal(msg)
--
Gitblit v1.8.0