2023-05-12 16:02:05 补充在设备今日无数据的情况下，增加空判断处理!

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);
 
 }

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));
+        if (null != devicePowerRes && null != hdata96){
             devicePowerRes.setTodayUsePowers(hdata96);
             return devicePowerRes;
+        } else {
+            return "该设备今日暂无数据！";
+        }
     }
 }