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-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java
index b133303..e2f1284 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java
@@ -15,9 +15,7 @@
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
import lombok.*;
-import org.hibernate.validator.constraints.Length;
import java.util.Date;
@@ -46,7 +44,6 @@
*/
@Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "鎺у埗鍣ㄥ湴鍧�涓嶈兘涓虹┖")
- @Length(message = "鎺у埗鍣ㄥ湴鍧�蹇呴』{max}浣�",min = 11, max = 11)
public String rtuAddr;
/**
@@ -54,8 +51,14 @@
*/
@Schema(description = "閫氳鍗忚", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖")
- @Length(message = "閫氳鍗忚涓嶅ぇ浜巤max}瀛�",max = 25)
public String protocol;
+
+ /**
+ * 閫氳鍗忚鐗堟湰鍙�
+ */
+ @Schema(description = "閫氳鍗忚鐗堟湰鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "閫氳鍗忚鐗堟湰鍙�")
+ public Integer protocolVersion;
/**
* 鍙戠幇鏃堕棿
@@ -63,5 +66,11 @@
@Schema(description = "鍙戠幇鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
// @NotNull(message = "鍙戠幇鏃堕棿涓嶈兘涓虹┖")
public Date findDt;//鍙戠幇鏃堕棿锛� yyyy-mm-dd HH:MM:SS锛�
+ /**
+ * 鏈烘瀯tag
+ */
+ @Schema(description = "鏈烘瀯tag", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "鏈烘瀯tag涓嶈兘涓虹┖")
+ public String orgTag;
}
--
Gitblit v1.8.0