From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 01 十一月 2024 11:25:00 +0800 Subject: [PATCH] 1、通信协议要增加版本号(目的为远程升级准备),原来没有版本号的协议默认为版本号为1,所以调整了程序命名; 2、流浪控制器与控制器数据库表都增加了协议版本号字段; 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java index 4b92e14..c70dfe5 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java @@ -1,15 +1,20 @@ package com.dy.pipIrrRemote.common.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; /** * @author ZhuBaoMin * @date 2024-07-23 10:36 * @LastEditTime 2024-07-23 10:36 - * @Description 鑷姩鍏抽榾锛堝畾鏃跺叧闃�銆佸畾閲忓叧闃�锛変紶杈撳璞� + * @Description 鑷姩鍏抽榾寮�闃�浼犺緭瀵硅薄 */ @Data +@EqualsAndHashCode(callSuper=true) public class AutomaticClose extends DtoBase { public static final long serialVersionUID = 202407231039001L; @@ -17,6 +22,12 @@ * 铏氭嫙鍗D */ private Long vcId; + + /** + * 璁″垝寮�闃�鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date plannedOpenTime; /** * 鐢ㄦ按鏃堕暱锛屾嫢鏈夊畾鏃跺叧闃� @@ -27,4 +38,5 @@ * 棰勭敤姘撮噺锛屾嫢鏈夊畾閲忓叧闃� */ private Integer waterAmount; + } -- Gitblit v1.8.0