From 16900a8d681aed70bca5b3fea8dc28715dde9712 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期三, 17 七月 2024 09:53:13 +0800 Subject: [PATCH] 2024-07-17 朱宝民 重构了获取取水口两个接口 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java index d935b7a..e880f90 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java @@ -15,6 +15,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import com.dy.common.po.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; @@ -30,7 +32,7 @@ @ToString @NoArgsConstructor @AllArgsConstructor -public class RmCommandHistory { +public class RmCommandHistory implements BaseEntity { public static final long serialVersionUID = 202401151517005L; /** @@ -38,7 +40,7 @@ */ @JSONField(serializeUsing = ObjectWriterImplToString.class) @TableId(type = IdType.INPUT) - private Long id; + private Long comId; /** * 鍔熻兘鐮� @@ -55,6 +57,7 @@ /** * 鍙栨按鍙D */ + @JSONField(serializeUsing= ObjectWriterImplToString.class) @NotNull(message = "鍙栨按鍙D涓嶈兘涓虹┖") private Long intakeId; @@ -80,6 +83,7 @@ * 鍙戦�佸懡浠ゆ椂闂� */ @NotNull(message = "鍙戦�佸懡浠ゆ椂闂翠笉鑳戒负绌�") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sendTime; /** -- Gitblit v1.8.0