From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 21 二月 2025 09:52:14 +0800 Subject: [PATCH] 针对王江海制定的协议: 1、优化相关注释; 2、优化代码; 3、协议中报警信息有变化:外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrControllerTramp.java | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 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 05ac965..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 @@ -16,7 +16,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.*; -import org.hibernate.validator.constraints.Length; + +import java.util.Date; /** * 娴佹氮鎺у埗鍣� @@ -39,11 +40,10 @@ public Long id; /** - * 閫氳鍗忚 + * 鎺у埗鍣ㄥ湴鍧� */ @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "鎺у埗鍣ㄥ湴鍧�涓嶈兘涓虹┖") - @Length(message = "鎺у埗鍣ㄥ湴鍧�蹇呴』{max}浣�",min = 11, max = 11) public String rtuAddr; /** @@ -51,14 +51,26 @@ */ @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; + + /** + * 鍙戠幇鏃堕棿 */ @Schema(description = "鍙戠幇鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "鍙戠幇鏃堕棿涓嶈兘涓虹┖") - public String findDt;//鍙戠幇鏃堕棿锛� yyyy-mm-dd HH:MM:SS锛� +// @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