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 caa8ff7..61b3c8a 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 2ccd0a3..0aaddb0 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)); - } }