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/client/ClientCtrl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java
index bd809b3..b68af91 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/ClientCtrl.java
@@ -49,6 +49,9 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
try {
+ if(qo.getOpenCount() == null){
+ qo.setOpenCount(0);
+ }
return BaseResponseUtils.buildSuccess(clientSv.getLargeOpenCountClients(qo));
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
@@ -69,6 +72,9 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
try {
+ if(qo.getOpenCount() == null){
+ qo.setOpenCount(0);
+ }
return BaseResponseUtils.buildSuccess(clientSv.getSmallOpenCountClients(qo));
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
@@ -89,6 +95,9 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
try {
+ if(qo.getWaterConsumption() == null){
+ qo.setWaterConsumption(0.0D);
+ }
return BaseResponseUtils.buildSuccess(clientSv.getLargeWaterConsumptionClients(qo));
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
@@ -109,6 +118,9 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
try {
+ if(qo.getWaterConsumption() == null){
+ qo.setWaterConsumption(0.0D);
+ }
return BaseResponseUtils.buildSuccess(clientSv.getSmallWaterConsumptionClients(qo));
} catch (Exception e) {
log.error("鑾峰彇璁板綍寮傚父", e);
@@ -129,6 +141,9 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
try {
+ if(qo.getAmountSpent() == null){
+ qo.setAmountSpent(0.0D);
+ }
return BaseResponseUtils.buildSuccess(clientSv.getLargeAmountSpentClients(qo));
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
@@ -149,6 +164,9 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
try {
+ if(qo.getAmountSpent() == null){
+ qo.setAmountSpent(0.0D);
+ }
return BaseResponseUtils.buildSuccess(clientSv.getSmallAmountSpentClients(qo));
} catch (Exception e) {
log.error("鑾峰彇璁板綍寮傚父", e);
@@ -169,6 +187,9 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
try {
+ if(qo.getWaterDuration() == null){
+ qo.setWaterDuration(0);
+ }
return BaseResponseUtils.buildSuccess(clientSv.getLargeWaterDurationClients(qo));
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
@@ -189,6 +210,9 @@
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
try {
+ if(qo.getWaterDuration() == null){
+ qo.setWaterDuration(0);
+ }
return BaseResponseUtils.buildSuccess(clientSv.getSmallWaterDurationClients(qo));
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
--
Gitblit v1.8.0