From 823cbaa8e120a6fc2e72a4e62c06d375cc821562 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 15 一月 2024 17:24:02 +0800 Subject: [PATCH] 1、增加流浪控制器实体(和数据库表); 2、修改部分通信协议实现; 3、增加部分通信协议实现; 4、增加通信中间件RTU上行数据处理任务树部分节点。 --- 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..1f712ff 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 = "琛屾斂鍖虹骇鍒笉姝g‘", value = 10) - @Min(message = "琛屾斂鍖虹骇鍒笉姝g‘",value = 0) + @Schema(description = "琛屾斂鍖虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "琛屾斂鍖虹紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null + @Length(message = "琛屾斂鍖虹紪鍙锋槸涓�浣嶆垨涓や綅鏁�", min = 1, max = 2) + 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