设备日志

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java

@@ -82,6 +82,10 @@ public class Device extends TenantEntity {
     @Schema(name = "蓝牙名称")
     private String bluetoothName;
 
+    /**
+     * 设备IMEI
+     * device_imei
+     */
     @Schema(name = "设备IMEI")
     private String deviceImei;
 

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceLog.java

@@ -2,6 +2,7 @@ package com.fuyuanshen.equipment.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -16,7 +17,7 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("device_log")
-public class DeviceLog extends BaseEntity {
+public class DeviceLog  extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -27,10 +28,16 @@ public class DeviceLog extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+
     /**
      * 设备行为
      */
     private String deviceAction;
+    // private Integer deviceActionInt;
 
     /**
      * 设备名称
@@ -47,5 +54,4 @@ public class DeviceLog extends BaseEntity {
      */
     private String content;
 
-
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceLogVo.java

@@ -1,5 +1,7 @@
 package com.fuyuanshen.equipment.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fuyuanshen.equipment.domain.DeviceLog;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -58,5 +60,10 @@ public class DeviceLogVo implements Serializable {
     @ExcelProperty(value = "内容")
     private String content;
 
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
 
 }