From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报（功能码83）报中的控制器时钟去除掉了，通信中间件解决这个报文时，把开阀报中的开阀时间当作控制器时钟，把关阀报中的关阀时间作为控制器时钟； 2、优化代码。
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java
index 06cdafa..ec67ab5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java
@@ -1,10 +1,7 @@
package com.dy.pipIrrBase.district;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import org.hibernate.validator.constraints.Length;
@@ -15,7 +12,10 @@
@Builder
@Schema(name = "琛屾斂鍖哄垝鍊煎璞�")
public class DistrictVo {
- @Schema(description = "涓婄骇琛屾斂鍖篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "琛屾斂鍖哄疄浣搃d", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id;
+
+ @Schema(description = "涓婄骇琛屾斂鍖篒D", requiredMode = Schema.RequiredMode.REQUIRED)
public Long supperId ;
@Schema(description = "琛屾斂鍖哄悕绉�", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -23,10 +23,15 @@
@Length(message = "琛屾斂鍖哄悕绉板皬浜巤max}瀛�", min = 1, max = 25)
public String name ;
- @Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "琛屾斂鍖虹骇鍒笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Max(message = "琛屾斂鍖虹骇鍒笉姝ｇ‘", value = 10)
- @Min(message = "琛屾斂鍖虹骇鍒笉姝ｇ‘",value = 0)
+ @Schema(description = "琛屾斂鍖虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "琛屾斂鍖虹紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Length(message = "琛屾斂鍖虹紪鍙锋槸涓�浣嶆垨涓や綅鏁�", min = 1, max = 3)
+ public String num ;
+
+ @Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Byte level ;
+ @Schema(description = "琛屾斂鍖哄垹闄ゆ爣蹇�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Byte deleted ;
+
}
--
Gitblit v1.8.0