From abd6d3aa3c8e7d7c60c3aee17bb0a6f52f1d29f5 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Tue, 29 Jul 2025 15:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DeviceLogController.java       |  1 +
 .../equipment/domain/DeviceLog.java           | 51 +++++++++++--------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceLogController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceLogController.java
index caa8ff77..61b3c8a3 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceLogController.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceLogController.java
@@ -102,4 +102,5 @@ public class DeviceLogController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(deviceLogService.deleteWithValidByIds(List.of(ids), true));
     }
+
 }
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceLog.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceLog.java
index 2ccd0a3b..0aaddb00 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceLog.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceLog.java
@@ -1,40 +1,51 @@
 package com.fuyuanshen.equipment.domain;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fuyuanshen.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
 
 /**
- * @Description:
- * @Author: WY
- * @Date: 2025/5/24
- **/
+ * 设备日志对象 device_log
+ *
+ * @author Lion Li
+ * @date 2025-07-29
+ */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("device_log")
-public class DeviceLog extends TenantEntity {
+public class DeviceLog extends BaseEntity {
 
-    @TableId(value = "id", type = IdType.AUTO)
-    // @Schema(value = "ID")
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id")
     private Long id;
 
-    // @Schema(value = "设备行为")
+    /**
+     * 设备行为
+     */
     private String deviceAction;
 
-    // @Schema(value = "设备名称")
+    /**
+     * 设备名称
+     */
     private String deviceName;
 
-    // @Schema(value = "数据来源")
+    /**
+     * 数据来源
+     */
     private String dataSource;
 
-    // @Schema(value = "内容")
+    /**
+     * 内容
+     */
     private String content;
 
-    public void copy(DeviceLog source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
-    }
 
 }