From 4f97850c9cc2098f460124a66266bdf6157319dd Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 26 六月 2025 15:46:29 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/weather/WeatherCtrl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

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 410677e..5ed8380 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
@@ -43,6 +43,9 @@
     @SsoAop()
     public BaseResponse<VoWeather> oneLast(Long weatherId){
         try {
+            if(weatherId == null){
+                return BaseResponseUtils.buildFail("姘旇薄绔檌d涓嶈兘涓虹┖") ;
+            }
             return BaseResponseUtils.buildSuccess(sv.oneLast(weatherId));
         } catch (Exception e) {
             return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -58,8 +61,10 @@
     @SsoAop()
     public BaseResponse<QueryResultVo<List<VoWeather>>> oneHistory(Long weatherId){
         try {
-
-            return BaseResponseUtils.buildSuccess(sv.oneHistory(weatherId));
+            if(weatherId == null){
+                return BaseResponseUtils.buildFail("姘旇薄绔檌d涓嶈兘涓虹┖") ;
+            }
+           return BaseResponseUtils.buildSuccess(sv.oneHistory(weatherId));
         } catch (Exception e) {
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }

--
Gitblit v1.8.0