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-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
index 6f977b5..ea6ef9e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
@@ -65,6 +66,13 @@
private String protocol;
/**
+ * 閫氳鍗忚鐗堟湰鍙�
+ */
+ @Schema(description = "鍗忚鐗堟湰鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "鍗忚鐗堟湰鍙�")
+ public Integer protocolVersion;
+
+ /**
* 鍙戠幇鏃ユ湡鏃堕棿
*/
@Schema(description = "鍙戠幇鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -99,4 +107,12 @@
*/
@Schema(description = "鍒犻櫎鏍囪瘑", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Byte deleted;
+
+
+ /////////////////////////////////////////
+ // 闈炴暟鎹簱灞炴��
+ /////////////////////////////////////////
+ @TableField(exist = false)
+ @Schema(description = "鍙栨按鍙ｇ紪鍙�")
+ public String intakeName ;
}
\ No newline at end of file
--
Gitblit v1.8.0