From 6f26cb4297ebaab4394e05e1a498e347ce290bb5 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 22 八月 2024 19:36:28 +0800
Subject: [PATCH] 修复运行方向的bug
---
repository/captureRepo.go | 5 +++--
models/positions.go | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/models/positions.go b/models/positions.go
index a2f4a75..d776b24 100644
--- a/models/positions.go
+++ b/models/positions.go
@@ -20,7 +20,7 @@
}
func (d *Positions) FindDevicePosition(devId string, timestamp int64) error {
- return db.Table(d.TableName()).Where("device_id = ? AND create_time <= ?", devId, timestamp).Order("id desc").First(&d).Error
+ return db.Table(d.TableName()).Where("device_id = ? AND create_time <= ?", devId, timestamp).Order("create_time desc").First(&d).Error
}
func (d *Positions) FindMovePosition(timestamp int64, pos string) error {
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index 0070ca1..9e6af55 100644
--- a/repository/captureRepo.go
+++ b/repository/captureRepo.go
@@ -227,8 +227,9 @@
floor = devPos.Pos
for i := 0; i < config.NVCSConf.WaitRunTime; i++ {
- if err := devPos.FindMovePosition(faceAppearTime.Unix()+5, floor); err == nil {
- switch devPos.RunDir {
+ var dbPos models.Positions
+ if err := dbPos.FindMovePosition(faceAppearTime.Unix()+5, floor); err == nil {
+ switch dbPos.RunDir {
case service.RunUp:
runDir = "in"
case service.RunDown:
--
Gitblit v1.8.0