From 725a97f62a30c53f7b2ca6ec69854b674d68e504 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 22 八月 2024 19:27:39 +0800
Subject: [PATCH] 修复楼层方向判断
---
repository/captureRepo.go | 3 +--
models/positions.go | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/models/positions.go b/models/positions.go
index b957033..a2f4a75 100644
--- a/models/positions.go
+++ b/models/positions.go
@@ -23,8 +23,8 @@
return db.Table(d.TableName()).Where("device_id = ? AND create_time <= ?", devId, timestamp).Order("id desc").First(&d).Error
}
-func (d *Positions) FindMovePosition(id uint, pos string) error {
- return db.Table(d.TableName()).Where("id > ? AND pos != ?", id, pos).First(&d).Error
+func (d *Positions) FindMovePosition(timestamp int64, pos string) error {
+ return db.Table(d.TableName()).Where("create_time <= ? AND pos != ?", timestamp, pos).First(&d).Error
}
func (d *Positions) FindPositionByTime(timestamp int64) error {
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index d1ecff6..0070ca1 100644
--- a/repository/captureRepo.go
+++ b/repository/captureRepo.go
@@ -225,10 +225,9 @@
_ = devPos.FindDevicePosition(deviceId, faceAppearTime.Unix()+5) // 鍔�5绉掔數姊叧闂ㄧ殑鏃堕棿
floor = devPos.Pos
- stopFloorId := devPos.Id
for i := 0; i < config.NVCSConf.WaitRunTime; i++ {
- if err := devPos.FindMovePosition(stopFloorId, floor); err == nil {
+ if err := devPos.FindMovePosition(faceAppearTime.Unix()+5, floor); err == nil {
switch devPos.RunDir {
case service.RunUp:
runDir = "in"
--
Gitblit v1.8.0