From 6f8cb882b706f74b4ea00927b0f3d77ab7937aa5 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期二, 29 七月 2025 16:04:00 +0800 Subject: [PATCH] yys 新增设备能耗管理 --- src/main/java/com/ruoyi/device/pojo/DeviceLedger.java | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java index f9c05b4..01233be 100644 --- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java +++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java @@ -3,8 +3,14 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; @@ -13,6 +19,7 @@ */ @Data @TableName("device_ledger") +@ApiModel public class DeviceLedger { /** @@ -24,11 +31,13 @@ /** * 璁惧鍚嶇О */ + @ApiModelProperty("璁惧鍚嶇О") private String deviceName; /** * 瑙勬牸鍨嬪彿 */ + @ApiModelProperty("瑙勬牸鍨嬪彿") private String deviceModel; /** @@ -70,25 +79,29 @@ * 褰曞叆鏃堕棿 */ @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** * 鏇存柊鏃堕棿 */ - @TableField(fill = FieldFill.UPDATE) + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; /** * 褰曞叆浜� */ @TableField(fill = FieldFill.INSERT) - private String createUser; + private Integer createUser; /** * 鏇存柊浜� */ - @TableField(fill = FieldFill.UPDATE) - private String updateUser; + @TableField(fill = FieldFill.INSERT_UPDATE) + private Integer updateUser; /** * 绉熸埛ID -- Gitblit v1.9.3