From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/dto/Block.java | 75 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/dto/Block.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/dto/Block.java
new file mode 100644
index 0000000..50fda27
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/dto/Block.java
@@ -0,0 +1,75 @@
+package com.dy.pipIrrBase.block.dto;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.dy.common.mybatis.envm.Deleted;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-08-13 11:39
+ * @LastEditTime 2024-08-13 11:39
+ * @Description 鐗囧尯瀵硅薄
+ */
+
+@Data
+public class Block {
+ public static final long serialVersionUID = 202408131140001L;
+
+ /**
+ * 鐗囧尯ID
+ */
+ private Long id;
+
+ /**
+ * 鐗囧尯鍚嶇О
+ */
+ @NotBlank(message = "鐗囧尯鍚嶇О涓嶈兘涓虹┖")
+ private String name;
+
+ /**
+ * 璐熻矗浜�
+ */
+ @Length(message = "鐗囧尯璐熻矗浜哄鍚嶄笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
+ private String header;
+
+ /**
+ * 璐熻矗浜虹數璇�
+ */
+ @Length(message = "鐗囧尯璐熻矗浜烘墜鏈哄彿蹇呴』{max}浣嶆暟鎹�", min = 11, max = 11)
+ private String phone;
+
+ /**
+ * 绉嶆闈㈢Н
+ */
+ @Max(message = "鐗囧尯闈㈢Н涓嶆纭�", value = 100000000)
+ @Min(message = "鐗囧尯闈㈢Н涓嶆纭�",value = 0)
+ private Integer area;
+
+ /**
+ * 鐢靛瓙鍦板浘鍖哄煙鐫�鑹�
+ */
+ @Length(message = "鍖哄煙鐫�鑹查暱搴﹀皬浜巤max}瀛�", min = 0, max = 6)
+ private String color;
+
+ /**
+ * 澶囨敞
+ */
+ @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 0, max = 50)
+ private String remark;
+
+ /**
+ * 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
+ */
+ private Deleted deleted;
+
+ /**
+ * 鍦板浘鍥惧舰瀵硅薄
+ */
+ private JSONArray graphs;
+
+
+}
--
Gitblit v1.8.0