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 "该设备今日暂无数据！";
+        }
     }
 }