From 539a78196da60eb97cf7057c5c85dfaa9b240741 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 11 十月 2024 16:21:32 +0800
Subject: [PATCH] 添加A3平层传感器数据获取方式
---
models/positions.go | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/models/positions.go b/models/positions.go
index a2f4a75..0978bca 100644
--- a/models/positions.go
+++ b/models/positions.go
@@ -3,7 +3,7 @@
import "time"
type Positions struct {
- Id uint `gorm:"column:id;primary_key;auto_increment;unique;not null;"`
+ Id uint `gorm:"column:id;primary_key;auto_increment;" json:"id"`
DeviceId string `gorm:"column:device_id;index" json:"device_id"`
Pos string `gorm:"column:pos" json:"pos"`
RunDir int `gorm:"column:run_dir" json:"run_dir"`
@@ -20,11 +20,11 @@
}
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 {
- return db.Table(d.TableName()).Where("create_time <= ? AND pos != ?", timestamp, pos).First(&d).Error
+ return db.Table(d.TableName()).Where("create_time >= ? AND pos != ?", timestamp, pos).First(&d).Error
}
func (d *Positions) FindPositionByTime(timestamp int64) error {
--
Gitblit v1.8.0