From 8c50ade9371d6afdeaaea442b1ac9baebd320886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Wed, 28 Jan 2026 16:21:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=85=E6=94=BE=E7=94=B5?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/device/domain/model/Dock.java | 13 +++++++++++++ .../ruoyi/device/mapper/entity/DockEntity.java | 16 ++++++++++++++++ .../com/ruoyi/device/service/dto/DockDTO.java | 3 +++ .../ruoyi/device/service/dto/DockDetailDTO.java | 4 ++++ .../V6__Add_last_active_time_to_dock.sql | 5 +++++ src/main/resources/mapper/device/DockMapper.xml | 6 +++++- 6 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/db/migration/V6__Add_last_active_time_to_dock.sql diff --git a/src/main/java/com/ruoyi/device/domain/model/Dock.java b/src/main/java/com/ruoyi/device/domain/model/Dock.java index 1b9f8a1..8ca0477 100644 --- a/src/main/java/com/ruoyi/device/domain/model/Dock.java +++ b/src/main/java/com/ruoyi/device/domain/model/Dock.java @@ -41,6 +41,9 @@ public class Dock implements Serializable /** 备注 */ private String remark; + /** 最后活跃时间 */ + private Date lastActiveTime; + public Long getDockId() { return dockId; @@ -130,4 +133,14 @@ public class Dock implements Serializable { this.remark = remark; } + + public Date getLastActiveTime() + { + return lastActiveTime; + } + + public void setLastActiveTime(Date lastActiveTime) + { + this.lastActiveTime = lastActiveTime; + } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/mapper/entity/DockEntity.java b/src/main/java/com/ruoyi/device/mapper/entity/DockEntity.java index b898012..ae8e93f 100644 --- a/src/main/java/com/ruoyi/device/mapper/entity/DockEntity.java +++ b/src/main/java/com/ruoyi/device/mapper/entity/DockEntity.java @@ -2,6 +2,8 @@ package com.ruoyi.device.mapper.entity; import com.ruoyi.common.core.web.domain.BaseEntity; +import java.util.Date; + /** * 机场表实体对象 device_dock * Mapper 层实体，对应数据库表 @@ -25,6 +27,9 @@ public class DockEntity extends BaseEntity /** 设备表主键 */ private Long deviceId; + /** 最后活跃时间 */ + private Date lastActiveTime; + public Long getDockId() { return dockId; @@ -65,6 +70,16 @@ public class DockEntity extends BaseEntity this.deviceId = deviceId; } + public Date getLastActiveTime() + { + return lastActiveTime; + } + + public void setLastActiveTime(Date lastActiveTime) + { + this.lastActiveTime = lastActiveTime; + } + @Override public String toString() { @@ -73,6 +88,7 @@ public class DockEntity extends BaseEntity ", dockName='" + dockName + '\'' + ", dockLocation='" + dockLocation + '\'' + ", deviceId=" + deviceId + + ", lastActiveTime=" + lastActiveTime + '}'; } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/service/dto/DockDTO.java b/src/main/java/com/ruoyi/device/service/dto/DockDTO.java index a131120..e22da02 100644 --- a/src/main/java/com/ruoyi/device/service/dto/DockDTO.java +++ b/src/main/java/com/ruoyi/device/service/dto/DockDTO.java @@ -44,5 +44,8 @@ public class DockDTO implements Serializable /** 备注 */ private String remark; + /** 最后活跃时间 */ + private Date lastActiveTime; + } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/service/dto/DockDetailDTO.java b/src/main/java/com/ruoyi/device/service/dto/DockDetailDTO.java index e36a7fd..4e07fc5 100644 --- a/src/main/java/com/ruoyi/device/service/dto/DockDetailDTO.java +++ b/src/main/java/com/ruoyi/device/service/dto/DockDetailDTO.java @@ -5,6 +5,7 @@ import com.ruoyi.device.api.domain.PayloadVO; import lombok.Data; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -154,5 +155,8 @@ public class DockDetailDTO implements Serializable */ private Double longitude; + /** 最后活跃时间 */ + private Date lastActiveTime; + } diff --git a/src/main/resources/db/migration/V6__Add_last_active_time_to_dock.sql b/src/main/resources/db/migration/V6__Add_last_active_time_to_dock.sql new file mode 100644 index 0000000..155986c --- /dev/null +++ b/src/main/resources/db/migration/V6__Add_last_active_time_to_dock.sql @@ -0,0 +1,5 @@ +-- 添加 last_active_time 字段到 dock 表 +ALTER TABLE dock ADD COLUMN last_active_time DATETIME COMMENT '最后活跃时间'; + +-- 为 last_active_time 字段创建索引以提高查询性能 +CREATE INDEX idx_dock_last_active_time ON dock(last_active_time); diff --git a/src/main/resources/mapper/device/DockMapper.xml b/src/main/resources/mapper/device/DockMapper.xml index 1234e2d..e56befc 100644 --- a/src/main/resources/mapper/device/DockMapper.xml +++ b/src/main/resources/mapper/device/DockMapper.xml @@ -14,11 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select dock_id, dock_name, dock_location, device_id, - create_by, create_time, update_by, update_time, remark + create_by, create_time, update_by, update_time, remark, last_active_time from device_dock @@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" device_id, create_by, remark, + last_active_time, create_time @@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deviceId}, #{createBy}, #{remark}, + #{lastActiveTime}, now() @@ -81,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" device_id = #{deviceId}, update_by = #{updateBy}, remark = #{remark}, + last_active_time = #{lastActiveTime}, update_time = now() where dock_id = #{dockId}