From dea7be54a6c1cf02b3a2c5170a23f90525d0336e Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Fri, 12 May 2023 15:46:35 +0800
Subject: [PATCH] =?UTF-8?q?2023-05-12=2015:46:23=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=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

---
 .../mapper/business/PsdcElectricHtdataMapper.xml  |  2 +-
 .../monitor/TotalElectricMeterController.java     | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml
index 238638e..f1359b9 100644
--- a/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml
@@ -88,7 +88,7 @@
 
 
     <select id="selTodayUseEnergy" resultType="java.lang.Double">
-        Select SUM(use_deiffen) From psdc_electric_htdata
+        Select NULLIF(SUM(use_deiffen), 0.0) From psdc_electric_htdata
         <where>
             <if test="deviceId != null and deviceId != ''">
                 device_id = #{deviceId}
diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
index 1eab891..dbb823d 100644
--- a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
+++ b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
@@ -56,11 +56,16 @@ public class TotalElectricMeterController {
     @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET)
     public AjaxResult selzdb1(@PathVariable(value = "deviceId", required = false) Integer deviceId)  {
         PsdcDevicePowerRes devicePowerRes = psdcThermometerHtdataService.selTotalElectricityInfo(deviceId);
-        Map map = psdcElectricHtdataService.selTotalElectricityInfo();
-        devicePowerRes.setEDay((Double) map.get("eday"));
-        devicePowerRes.setEMonth((Double) map.get("emonth"));
-        AjaxResult ajax = AjaxResult.success(devicePowerRes);
-        return ajax;
+        if (null != devicePowerRes){
+            Map map = psdcElectricHtdataService.selTotalElectricityInfo();
+            devicePowerRes.setEDay((Double) map.get("eday"));
+            devicePowerRes.setEMonth((Double) map.get("emonth"));
+            AjaxResult ajax = AjaxResult.success(devicePowerRes);
+            return ajax;
+        } else {
+            return AjaxResult.success("该设备今日暂无数据！");
+        }
+
     }
 
     @PreAuthorize("@ss.hasPermi('emonitor:db')")