From 17c66730e1c1e1f9875dac349f8cdb503d00ed9e Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 27 Apr 2026 14:10:10 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E7=BB=9F=E8=AE=A1=E8=83=BD=E8=80=97?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BA=94=E7=A7=8D=E8=83=BD?=
 =?UTF-8?q?=E6=BA=90=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../os/ems/report/mapper/EmsReportMapper.java |  20 +++
 .../service/impl/EmsReportServiceImpl.java    |  21 +++-
 .../mapper/ems/report/EmsReportMapper.xml     | 116 ++++++++++++++++++
 3 files changed, 151 insertions(+), 6 deletions(-)

diff --git a/os-ems/src/main/java/com/os/ems/report/mapper/EmsReportMapper.java b/os-ems/src/main/java/com/os/ems/report/mapper/EmsReportMapper.java
index effd569..ffcae05 100644
--- a/os-ems/src/main/java/com/os/ems/report/mapper/EmsReportMapper.java
+++ b/os-ems/src/main/java/com/os/ems/report/mapper/EmsReportMapper.java
@@ -24,6 +24,26 @@ public interface EmsReportMapper
      */
     List<EnergyStatisticalReport> energyStatisticalDnbReportList(Map hashMap);
 
+    /**
+     * 统计能耗水报表
+     */
+    List<EnergyStatisticalReport> energyStatisticalWaterReportList(Map hashMap);
+
+    /**
+     * 统计能耗蒸汽报表
+     */
+    List<EnergyStatisticalReport> energyStatisticalSteamReportList(Map hashMap);
+
+    /**
+     * 统计能耗压缩空气报表
+     */
+    List<EnergyStatisticalReport> energyStatisticalAirReportList(Map hashMap);
+
+    /**
+     * 统计能耗氮气报表
+     */
+    List<EnergyStatisticalReport> energyStatisticalNitrogenReportList(Map hashMap);
+
     /**
      * 峰平谷耗量报表
      * @param hashMap
diff --git a/os-ems/src/main/java/com/os/ems/report/service/impl/EmsReportServiceImpl.java b/os-ems/src/main/java/com/os/ems/report/service/impl/EmsReportServiceImpl.java
index 9e851ca..4b16fb3 100644
--- a/os-ems/src/main/java/com/os/ems/report/service/impl/EmsReportServiceImpl.java
+++ b/os-ems/src/main/java/com/os/ems/report/service/impl/EmsReportServiceImpl.java
@@ -47,16 +47,25 @@ public class EmsReportServiceImpl implements IEmsReportService {
      */
     @Override
     public List<EnergyStatisticalReport> energyStatisticalReportList(Map hashMap) {
-        if (!hashMap.containsKey("dateType") && !hashMap.containsKey("energyType")) {
+        if (hashMap == null || !hashMap.containsKey("dateType") || !hashMap.containsKey("energyType")) {
             return null;
         }
         hashMap.put("timeSub", Integer.parseInt(String.valueOf(hashMap.get("dateType"))));
-        List<EnergyStatisticalReport> reportList = new ArrayList<>();
-
-        if (Objects.equals(String.valueOf(hashMap.get("energyType")), "2")) {
-            reportList = emsReportMapper.energyStatisticalDnbReportList(hashMap);
+        String energyType = String.valueOf(hashMap.get("energyType"));
+        switch (energyType) {
+            case "2":
+                return emsReportMapper.energyStatisticalDnbReportList(hashMap);
+            case "3":
+                return emsReportMapper.energyStatisticalWaterReportList(hashMap);
+            case "4":
+                return emsReportMapper.energyStatisticalSteamReportList(hashMap);
+            case "5":
+                return emsReportMapper.energyStatisticalAirReportList(hashMap);
+            case "6":
+                return emsReportMapper.energyStatisticalNitrogenReportList(hashMap);
+            default:
+                return new ArrayList<>();
         }
-        return reportList;
     }
 
     /**
diff --git a/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml b/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml
index e04aa61..8e6938b 100644
--- a/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml
@@ -34,6 +34,122 @@
         ORDER BY beginTime, workUnitCode
     </select>
 
+    <select id="energyStatisticalWaterReportList" resultType="com.os.ems.report.domain.EnergyStatisticalReport"
+            parameterType="java.util.HashMap">
+        WITH DT AS (SELECT CAST(#{timeSub} AS INT) TIMESUB)
+        SELECT WU.WORK_UNIT_CODE                                                       workUnitCode,
+        WU.WORK_UNIT_NAME                                                       workUnitName,
+        MAX(RPD.INSTRUMENT_VALUE)                                               instrumentValue,
+        SUM(RPD.EXPEND * IIF(MWU.formula_mode = 0, 1, 0) * MWU.proportion)    expend,
+        MAX(CAST(0 AS DECIMAL(18, 4)))                                          powerExpend,
+        SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB) beginTime,
+        SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB) endTime
+        FROM ems_base_work_unit WU
+        LEFT JOIN ems_base_monitor_work_unit MWU ON MWU.WORK_UNIT_CODE = WU.WORK_UNIT_CODE
+        LEFT JOIN ems_report_point_water RPD ON RPD.MONITOR_CODE = MWU.MONITOR_CODE
+        CROSS JOIN DT
+        WHERE RPD.EXPEND IS NOT NULL
+        <if test="beginCollectTime != null and beginCollectTime != '' and endCollectTime != null and endCollectTime != ''">
+            and FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss') between  #{beginCollectTime} and #{endCollectTime}
+        </if>
+        <if test="workUnitCode != null  and workUnitCode != ''">and WU.WORK_UNIT_CODE = #{workUnitCode}</if>
+        <if test="workUnitCodeList != null  and workUnitCodeList.size > 0">
+            and WU.WORK_UNIT_CODE IN
+            <foreach item="workUnitCode" collection="workUnitCodeList" open="(" separator="," close=")">
+                #{workUnitCode}
+            </foreach>
+        </if>
+        GROUP BY WU.WORK_UNIT_CODE, WU.WORK_UNIT_NAME, SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB)
+        ORDER BY beginTime, workUnitCode
+    </select>
+
+    <select id="energyStatisticalSteamReportList" resultType="com.os.ems.report.domain.EnergyStatisticalReport"
+            parameterType="java.util.HashMap">
+        WITH DT AS (SELECT CAST(#{timeSub} AS INT) TIMESUB)
+        SELECT WU.WORK_UNIT_CODE                                                       workUnitCode,
+        WU.WORK_UNIT_NAME                                                       workUnitName,
+        MAX(RPD.INSTRUMENT_VALUE)                                               instrumentValue,
+        SUM(RPD.EXPEND * IIF(MWU.formula_mode = 0, 1, 0) * MWU.proportion)    expend,
+        MAX(CAST(0 AS DECIMAL(18, 4)))                                          powerExpend,
+        SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB) beginTime,
+        SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB) endTime
+        FROM ems_base_work_unit WU
+        LEFT JOIN ems_base_monitor_work_unit MWU ON MWU.WORK_UNIT_CODE = WU.WORK_UNIT_CODE
+        LEFT JOIN ems_report_point_steam RPD ON RPD.MONITOR_CODE = MWU.MONITOR_CODE
+        CROSS JOIN DT
+        WHERE RPD.EXPEND IS NOT NULL
+        <if test="beginCollectTime != null and beginCollectTime != '' and endCollectTime != null and endCollectTime != ''">
+            and FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss') between  #{beginCollectTime} and #{endCollectTime}
+        </if>
+        <if test="workUnitCode != null  and workUnitCode != ''">and WU.WORK_UNIT_CODE = #{workUnitCode}</if>
+        <if test="workUnitCodeList != null  and workUnitCodeList.size > 0">
+            and WU.WORK_UNIT_CODE IN
+            <foreach item="workUnitCode" collection="workUnitCodeList" open="(" separator="," close=")">
+                #{workUnitCode}
+            </foreach>
+        </if>
+        GROUP BY WU.WORK_UNIT_CODE, WU.WORK_UNIT_NAME, SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB)
+        ORDER BY beginTime, workUnitCode
+    </select>
+
+    <select id="energyStatisticalAirReportList" resultType="com.os.ems.report.domain.EnergyStatisticalReport"
+            parameterType="java.util.HashMap">
+        WITH DT AS (SELECT CAST(#{timeSub} AS INT) TIMESUB)
+        SELECT WU.WORK_UNIT_CODE                                                       workUnitCode,
+        WU.WORK_UNIT_NAME                                                       workUnitName,
+        MAX(RPD.INSTRUMENT_VALUE)                                               instrumentValue,
+        SUM(RPD.EXPEND * IIF(MWU.formula_mode = 0, 1, 0) * MWU.proportion)    expend,
+        MAX(CAST(0 AS DECIMAL(18, 4)))                                          powerExpend,
+        SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB) beginTime,
+        SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB) endTime
+        FROM ems_base_work_unit WU
+        LEFT JOIN ems_base_monitor_work_unit MWU ON MWU.WORK_UNIT_CODE = WU.WORK_UNIT_CODE
+        LEFT JOIN ems_report_point_air RPD ON RPD.MONITOR_CODE = MWU.MONITOR_CODE
+        CROSS JOIN DT
+        WHERE RPD.EXPEND IS NOT NULL
+        <if test="beginCollectTime != null and beginCollectTime != '' and endCollectTime != null and endCollectTime != ''">
+            and FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss') between  #{beginCollectTime} and #{endCollectTime}
+        </if>
+        <if test="workUnitCode != null  and workUnitCode != ''">and WU.WORK_UNIT_CODE = #{workUnitCode}</if>
+        <if test="workUnitCodeList != null  and workUnitCodeList.size > 0">
+            and WU.WORK_UNIT_CODE IN
+            <foreach item="workUnitCode" collection="workUnitCodeList" open="(" separator="," close=")">
+                #{workUnitCode}
+            </foreach>
+        </if>
+        GROUP BY WU.WORK_UNIT_CODE, WU.WORK_UNIT_NAME, SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB)
+        ORDER BY beginTime, workUnitCode
+    </select>
+
+    <select id="energyStatisticalNitrogenReportList" resultType="com.os.ems.report.domain.EnergyStatisticalReport"
+            parameterType="java.util.HashMap">
+        WITH DT AS (SELECT CAST(#{timeSub} AS INT) TIMESUB)
+        SELECT WU.WORK_UNIT_CODE                                                       workUnitCode,
+        WU.WORK_UNIT_NAME                                                       workUnitName,
+        MAX(RPD.INSTRUMENT_VALUE)                                               instrumentValue,
+        SUM(RPD.EXPEND * IIF(MWU.formula_mode = 0, 1, 0) * MWU.proportion)    expend,
+        MAX(CAST(0 AS DECIMAL(18, 4)))                                          powerExpend,
+        SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB) beginTime,
+        SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB) endTime
+        FROM ems_base_work_unit WU
+        LEFT JOIN ems_base_monitor_work_unit MWU ON MWU.WORK_UNIT_CODE = WU.WORK_UNIT_CODE
+        LEFT JOIN ems_report_point_nitrogen RPD ON RPD.MONITOR_CODE = MWU.MONITOR_CODE
+        CROSS JOIN DT
+        WHERE RPD.EXPEND IS NOT NULL
+        <if test="beginCollectTime != null and beginCollectTime != '' and endCollectTime != null and endCollectTime != ''">
+            and FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss') between  #{beginCollectTime} and #{endCollectTime}
+        </if>
+        <if test="workUnitCode != null  and workUnitCode != ''">and WU.WORK_UNIT_CODE = #{workUnitCode}</if>
+        <if test="workUnitCodeList != null  and workUnitCodeList.size > 0">
+            and WU.WORK_UNIT_CODE IN
+            <foreach item="workUnitCode" collection="workUnitCodeList" open="(" separator="," close=")">
+                #{workUnitCode}
+            </foreach>
+        </if>
+        GROUP BY WU.WORK_UNIT_CODE, WU.WORK_UNIT_NAME, SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB)
+        ORDER BY beginTime, workUnitCode
+    </select>
+
     <select id="peaksValleysConsumptionReportList"
             resultType="com.os.ems.report.domain.PeaksValleysConsumptionReport" parameterType="java.util.HashMap">
         SELECT ebwu.work_unit_code workUnitCode, ebwu.work_unit_name workUnitName,