From 6faab2c818a4210a708445d42f6c4352a1dfa596 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 八月 2025 09:28:36 +0800
Subject: [PATCH] 使一个站的气象、墒情历史数据查询支持一天的时间范围内查询
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/weather/WeatherCtrl.java | 5 +++--
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java
index 5e51809..2478f0d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java
@@ -153,10 +153,11 @@
if(qo.soilId == null){
return BaseResponseUtils.buildFail("澧掓儏绔檌d涓嶈兘涓虹┖") ;
}
+ String dtStart = qo.timeStart ;
qo.completionTime();
if(qo.timeStop == null || qo.timeStop.trim().equals("")){
- if(qo.timeStart != null && !qo.timeStart.trim().equals("")){
- qo.timeStop = qo.timeStart + " 23:59:59";
+ if(dtStart != null && !dtStart.trim().equals("")){
+ qo.timeStop = dtStart + " 23:59:59";
}
}
return BaseResponseUtils.buildSuccess(sv.oneHistory(qo));
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/weather/WeatherCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/weather/WeatherCtrl.java
index 4ad2bac..c5aae42 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/weather/WeatherCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/weather/WeatherCtrl.java
@@ -64,10 +64,11 @@
if(qo.weatherId == null){
return BaseResponseUtils.buildFail("姘旇薄绔檌d涓嶈兘涓虹┖") ;
}
+ String dtStart = qo.timeStart ;
qo.completionTime();
if(qo.timeStop == null || qo.timeStop.trim().equals("")){
- if(qo.timeStart != null && !qo.timeStart.trim().equals("")){
- qo.timeStop = qo.timeStart + " 23:59:59";
+ if(dtStart != null && !dtStart.trim().equals("")){
+ qo.timeStop = dtStart + " 23:59:59";
}
}
return BaseResponseUtils.buildSuccess(sv.oneHistory(qo));
--
Gitblit v1.8.0