From 957e2f72b288b01f4c6e6fcc68d3e6ee4d916972 Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Fri, 12 May 2023 16:02:18 +0800
Subject: [PATCH] =?UTF-8?q?2023-05-12=2016:02:05=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=9C=A8=E8=AE=BE=E5=A4=87=E4=BB=8A=E6=97=A5=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A9=BA=E5=88=A4=E6=96=AD=E5=A4=84=E7=90=86!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/psdc/service/IPsdcElectricRtdataService.java   |  2 +-
 .../service/impl/PsdcElectricRtdataServiceImpl.java    | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcElectricRtdataService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcElectricRtdataService.java
index 8a0f224..0d24cd2 100644
--- a/psdc-business/src/main/java/com/psdc/service/IPsdcElectricRtdataService.java
+++ b/psdc-business/src/main/java/com/psdc/service/IPsdcElectricRtdataService.java
@@ -12,6 +12,6 @@ import com.psdc.entity.res.PsdcDevicePowerRes;
  */
 public interface IPsdcElectricRtdataService {
 
-    PsdcDevicePowerRes queryById(Integer deviceId);
+    Object queryById(Integer deviceId);
 
 }
diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java
index 0e8bb6a..567e1a1 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java
@@ -36,12 +36,16 @@ public class PsdcElectricRtdataServiceImpl implements IPsdcElectricRtdataService
      * @return
      */
     @Override
-    public PsdcDevicePowerRes queryById(Integer deviceId) {
+    public Object queryById(Integer deviceId) {
         long userId = SecurityUtils.getUserId();
         Date date = new Date();
         PsdcDevicePowerRes devicePowerRes = electricRtdataMapper.queryById(deviceId, sdf.format(date));
         PsdcDevicePowerHdata96 hdata96 = devicePowerHdata96Mapper.queryById(userId, deviceId, sdf2.format(date));
-        devicePowerRes.setTodayUsePowers(hdata96);
-        return devicePowerRes;
+        if (null != devicePowerRes && null != hdata96){
+            devicePowerRes.setTodayUsePowers(hdata96);
+            return devicePowerRes;
+        } else {
+            return "该设备今日暂无数据！";
+        }
     }
 }