From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 21 十二月 2023 21:47:15 +0800 Subject: [PATCH] 1、common模块优化代码,Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler; 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。 --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVo.java | 10 ++-------- 1 files changed, 2 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 a542141..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; @@ -18,7 +15,7 @@ @Schema(description = "琛屾斂鍖哄疄浣搃d", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public Long id; - @Schema(description = "涓婄骇琛屾斂鍖篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @Schema(description = "涓婄骇琛屾斂鍖篒D", requiredMode = Schema.RequiredMode.REQUIRED) public Long supperId ; @Schema(description = "琛屾斂鍖哄悕绉�", requiredMode = Schema.RequiredMode.REQUIRED) @@ -31,10 +28,7 @@ @Length(message = "琛屾斂鍖虹紪鍙锋槸涓�浣嶆垨涓や綅鏁�", min = 1, max = 2) public String num ; - @Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "琛屾斂鍖虹骇鍒笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null - @Max(message = "琛屾斂鍖虹骇鍒笉姝g‘", value = 10) - @Min(message = "琛屾斂鍖虹骇鍒笉姝g‘",value = 0) + @Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public Byte level ; @Schema(description = "琛屾斂鍖哄垹闄ゆ爣蹇�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) -- Gitblit v1.8.0