From 5abbb114d703b40d2a42e9e3eecdadcb6d341dcf Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 29 四月 2024 03:51:11 +0800
Subject: [PATCH] 修复keepalive地址

---
 models/positions.go |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/models/positions.go b/models/positions.go
index db9a27a..daccc16 100644
--- a/models/positions.go
+++ b/models/positions.go
@@ -4,7 +4,8 @@
 	Id         uint   `gorm:"column:id;primary_key;auto_increment;unique;not null;"`
 	DeviceId   string `gorm:"column:device_id;" json:"device_id"`
 	Pos        string `gorm:"column:pos" json:"pos"`
-	CreateTime int64  `gorm:"column:create_time;autoCreateTime;"`
+	CreateTime int64  `gorm:"column:create_time;"`
+	TimeString string `gorm:"column:time_string;"`
 }
 
 func (d *Positions) TableName() string {
@@ -12,5 +13,9 @@
 }
 
 func (d *Positions) FindDevicePosition(devId string, timestamp int64) error {
-	return db.Table(d.TableName()).Where(&d, "device_id = ? AND create_time < ?", devId, timestamp).Order("create_time 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) FindPositionByTime(timestamp int64) error {
+	return db.Table(d.TableName()).Where("create_time <= ?", timestamp).Order("create_time desc").First(&d).Error
 }

--
Gitblit v1.8.0