添加充放电状态

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;
+    }
 }

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 +
                 '}';
     }
 }

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;
+
 
 }

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;
+
 
 }

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);

src/main/resources/mapper/device/DockMapper.xml

@@ -14,11 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"         column="update_by"      />
         <result property="updateTime"       column="update_time"    />
         <result property="remark"           column="remark"         />
+        <result property="lastActiveTime"   column="last_active_time" />
     </resultMap>
 
     <sql id="selectDockVo">
         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
     </sql>
 
@@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null">device_id,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="remark != null and remark != ''">remark,</if>
+            <if test="lastActiveTime != null">last_active_time,</if>
             create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null">#{deviceId},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="lastActiveTime != null">#{lastActiveTime},</if>
             now()
         </trim>
     </insert>
@@ -81,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null">device_id = #{deviceId},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="lastActiveTime != null">last_active_time = #{lastActiveTime},</if>
             update_time = now()
         </trim>
         where dock_id = #{dockId}