From d6e4f79177f42df82f3150cc4075605e72746fde Mon Sep 17 00:00:00 2001
From: jiang <BnsGit@123!>
Date: Thu, 24 Jul 2025 19:39:21 +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     | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 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 dca2829..f1d502b 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DeviceEnergyAnalysisMapper.xml
@@ -19,7 +19,8 @@
 
     <select id="selectDeviceEnergyByDateRange" resultType="com.securitycontrol.screen.domain.DeviceEnergyAnalysis">
         SELECT device_name          AS deviceName,
-               SUM(consumption_kwh) AS consumptionKwh
+               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}
@@ -53,26 +54,4 @@
 
     </select>
 
-    <select id="selectLatestAll" resultType="com.securitycontrol.screen.domain.EnergySavingMeasure">
-        SELECT esm.id            AS id,
-               esm.measure_name  AS measureName,
-               esm.coverage_rate AS coverageRate,
-               esm.stat_date     AS statDate
-        FROM energy_saving_measures esm
-                 INNER JOIN (SELECT measure_name,
-                                    MAX(stat_date) AS max_date,
-                                    pro_id
-                             FROM energy_saving_measures
-                             WHERE pro_id = #{proId}
-                             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}
-        ORDER BY esm.coverage_rate DESC
-
-    </select>
-
-
-
-
 </mapper>