From c1ba562d638ae75bef24012db614c6819a9c71de Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 八月 2025 09:11:16 +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, 10 insertions(+), 0 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 e3e2cb6..5e51809 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
@@ -154,6 +154,11 @@
return BaseResponseUtils.buildFail("澧掓儏绔檌d涓嶈兘涓虹┖") ;
}
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";
+ }
+ }
return BaseResponseUtils.buildSuccess(sv.oneHistory(qo));
} catch (Exception e) {
return BaseResponseUtils.buildException(e.getMessage()) ;
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 c53f4db..4ad2bac 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
@@ -65,6 +65,11 @@
return BaseResponseUtils.buildFail("姘旇薄绔檌d涓嶈兘涓虹┖") ;
}
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";
+ }
+ }
return BaseResponseUtils.buildSuccess(sv.oneHistory(qo));
} catch (Exception e) {
return BaseResponseUtils.buildException(e.getMessage()) ;
--
Gitblit v1.8.0