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-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java index c5d1a82..7938329 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.dy.common.po.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Positive; import lombok.*; import org.hibernate.validator.constraints.Length; @@ -16,7 +17,7 @@ /** * @author ZhuBaoMin * @date 2023/12/9 8:55 - * @LastEditTime 2023/12/9 8:55 + * @LastEditTime 2023/12/19 15:14 * @Description */ @@ -46,15 +47,15 @@ * 姘村崱缂栧彿 */ @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @Length(message = "姘村崱缂栧彿涓嶅皬浜巤min}", min = 1) - private Long cardid; + @NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖") + private String cardnum; /** * 鍐滄埛缂栧彿 */ @Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @Length(message = "鍐滄埛缂栧彿涓嶅皬浜巤min}", min = 1) - private Long clientid; + @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖") + private String clientnum; /** * 浣欓 -- Gitblit v1.8.0