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-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilDto.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilDto.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilDto.java
index 800cfc5..40d822b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilDto.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilDto.java
@@ -3,6 +3,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrStSoil;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
@@ -20,6 +21,12 @@
public String id;
/**
+ * 澧掓儏绔橣Box搴忓垪鍙�
+ */
+ @NotEmpty(message = "澧掓儏绔橣Box搴忓垪鍙�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ public String fboxId;
+
+ /**
* 澧掓儏绔欏悕绉�
*/
@NotEmpty(message = "澧掓儏绔欏悕绉颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
@@ -27,7 +34,7 @@
/**
* 澧掓儏绔欑紪鍙�
*/
- @NotEmpty(message = "澧掓儏绔欑紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @NotNull(message = "澧掓儏绔欑紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
public Integer no;
@@ -48,6 +55,7 @@
public PrStSoil toNewPo(){
PrStSoil po = new PrStSoil();
+ po.fboxId = this.fboxId;
po.name = this.name;
po.no = this.no;
po.lng = this.lng;
--
Gitblit v1.8.0