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-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java
index c6dc097..cd9351e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java
@@ -1,9 +1,8 @@
package com.dy.pipIrrStatistics.intake.qo;
-import com.dy.common.webUtil.QueryConditionVo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author :WuZeYu
@@ -12,12 +11,19 @@
* @Description
*/
@Data
-public class IntakeCountValueQO extends IntakeQO {
+@EqualsAndHashCode(callSuper = false)
+public class IntakeCountValueQO extends CommonQO {
/**
* 鍊�
*/
- @NotBlank(message = "鍊间笉鑳戒负绌�")
- private int value;
+ @NotNull(message = "鍊间笉鑳戒负绌�")
+ public Integer value;
+
+
+ ///////////////////////
+ //闈炲墠绔彁浜ょ殑鍙傛暟
+ public Long idStart ;
+ public Long idEnd ;
}
--
Gitblit v1.8.0