From 9f56f778570ba51b44755a2a6f67a1f317a8f44f Mon Sep 17 00:00:00 2001
From: jiang <BnsGit@123!>
Date: Thu, 24 Jul 2025 17:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E8=83=BD=E5=87=8F=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DeviceEnergyAnalysisMapper.xml      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml
index 5be290e..dca2829 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml
@@ -6,14 +6,15 @@
 <mapper namespace="com.securitycontrol.screen.mapper.DeviceEnergyAnalysisMapper">
 
     <select id="selectEnergyStatsByDateRange" resultType="com.securitycontrol.screen.domain.DeviceEnergyAnalysis">
-        SELECT stat_date               AS statDate,
-               SUM(consumption_kwh)    AS consumptionKwh,
-               SUM(renewable_used_kwh) AS renewableUsedKwh
+        SELECT DATE(stat_date)                 AS statDate, -- 截断为日期（去掉小时）
+               SUM(consumption_kwh)            AS consumptionKwh,
+               SUM(renewable_used_kwh * 0.997) AS renewableUsedKwh
         FROM device_energy_analysis
-        WHERE stat_date BETWEEN #{startDate} AND #{endDate}
-        and pro_id =#{proId}
-        GROUP BY stat_date
-        ORDER BY stat_date ASC
+        WHERE stat_date >= #{startDate}
+          AND stat_date &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
+          and pro_id = #{proId}
+        GROUP BY DATE(stat_date)
+        ORDER BY statDate ASC
     </select>
 
     <select id="selectDeviceEnergyByDateRange" resultType="com.securitycontrol.screen.domain.DeviceEnergyAnalysis">
@@ -63,12 +64,11 @@
                                     pro_id
                              FROM energy_saving_measures
                              WHERE pro_id = #{proId}
-                               AND stat_date BETWEEN #{startDate} AND #{endDate}
                              GROUP BY measure_name, pro_id) t ON esm.measure_name = t.measure_name
             AND esm.stat_date = t.max_date
             AND esm.pro_id = t.pro_id
         WHERE esm.pro_id = #{proId}
-          AND esm.stat_date BETWEEN #{startDate} AND #{endDate};
+        ORDER BY esm.coverage_rate DESC
 
     </select>