From 5cda8b65ccc67f5248509157df5771e90dea4345 Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期二, 28 五月 2024 20:31:19 +0800 Subject: [PATCH] 修改faceid --- config/config.go | 1 + pkg/floor.go | 13 ++++++------- repository/captureRepo.go | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/config/config.go b/config/config.go index 922d680..9e6034b 100644 --- a/config/config.go +++ b/config/config.go @@ -31,6 +31,7 @@ ChannelNo string `mapstructure:"channel-number"` // 閫氶亾鍙�, 鍚宨d HeartbeatInterval int `mapstructure:"heartbeat-interval"` // 蹇冭烦鍛ㄦ湡 HeartbeatFailCount int `mapstructure:"heartbeat-count"` // 蹇冭烦瓒呮椂娆℃暟 + AddFloorToFaceId bool `mapstructure:"add-floor-faceId"` Enable bool `mapstructure:"enable"` } diff --git a/pkg/floor.go b/pkg/floor.go index 591c115..1e2ff9a 100644 --- a/pkg/floor.go +++ b/pkg/floor.go @@ -4,15 +4,14 @@ "fmt" "strconv" "strings" - - "gat1400Exchange/pkg/snowflake" ) // 鐢熸垚涓�涓寘鍚ゼ灞傜殑浜鸿劯id,瑙f瀽妤煎眰 -// 浣跨敤48浣嶆簮id, 鍏朵腑鍓�41浣嶆槸imageid, 涓嶅彲浠ヤ慨鏀� +99 + 3浣嶆ゼ灞�(绗竴浣�0琛ㄧず姝�,1琛ㄧず璐�) + 2浣嶉殢鏈烘暟 +// 浣跨敤48浣嶆簮id, 鍏朵腑鍓�41浣嶆槸imageid, 涓嶅彲浠ヤ慨鏀� 41-43浣嶅~ 06 浠h〃鍥惧儚, +99 + 3浣嶆ゼ灞�(绗竴浣�0琛ㄧず姝�,1琛ㄧず璐�) func GenerateFaceIdContainFloor(srcId, floorStr string) string { floorNum, _ := parseFloor(floorStr) - newId := srcId[0:41] + "99" + floorNum + snowflake.CreateRandomNumber(2) + newId := srcId[0:43] + "99" + floorNum + //newId := srcId[0:43] + "99" + floorNum + snowflake.CreateRandomNumber(1) return newId } @@ -22,11 +21,11 @@ return "", fmt.Errorf("invalid id %s", srcId) } - if srcId[41:43] != "99" { - return "", fmt.Errorf("invalid flag %s", srcId[41:43]) + if srcId[43:45] != "99" { + return "", fmt.Errorf("invalid flag %s", srcId[43:45]) } - return restoreFloor(srcId[43:46]) + return restoreFloor(srcId[45:48]) } // parseFloor parses the floor string and returns a three-character string diff --git a/repository/captureRepo.go b/repository/captureRepo.go index 57f5e23..d0702b5 100644 --- a/repository/captureRepo.go +++ b/repository/captureRepo.go @@ -97,7 +97,7 @@ } // 灏濊瘯浠巉aceId鎻愬彇妤煎眰 - if pd.CameraFloor == "" { + if pd.CameraFloor == "" && config.ClientConf.AddFloorToFaceId { pd.CameraFloor, _ = pkg.ParseFloorFromId(face.FaceID) } //logger.Debug("device %s, CameraFloor:%s", deviceId, pd.CameraFloor) @@ -182,7 +182,9 @@ 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) + if config.ClientConf.AddFloorToFaceId { + msg.FaceListObject.FaceObject[idx].FaceID = pkg.GenerateFaceIdContainFloor(face.FaceID, devPos.Pos) + } } b, _ := json.Marshal(msg) -- Gitblit v1.8.0