光伏统计修改

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/EnergyConsumptionController.java

@@ -403,19 +403,6 @@ public class EnergyConsumptionController extends BaseController {
     }
 
     /**
-     * 查询区域小时用水明细（按时间序列）
-     */
-    @GetMapping("/area/water/hour/byTimeIndex")
-    @ApiOperation("查询按时间序列的区域用水统计")
-    public AjaxResult getAreaWaterByTimeIndex(QueryMeter queryMeter) {
-        if (StringUtils.isBlank(queryMeter.getOrderFlag())) {
-            queryMeter.setOrderFlag("asc");
-        }
-        List<WaterMeterH> list = waterConsumptionService.getAreaWaterHourMeter(queryMeter);
-        return success(list);
-    }
-
-    /**
      * 查询设施小时用水明细
      */
     @GetMapping("/facs/water/hour/list")

ems/ems-core/src/main/java/com/ruoyi/ems/mapper/ElecPvSupplyHMapper.java

@@ -21,7 +21,7 @@ public interface ElecPvSupplyHMapper {
      * @param queryMeter 查询参数
      * @return 结果
      */
-    List<PvSupplyVO> selectPvSupplyHourlyList(QueryMeter queryMeter);
+    List<PvSupplyVO> selectPvSupplyHourlyList(@Param("queryMeter") QueryMeter queryMeter);
 
     /**
      * 查询光伏产能按日统计列表

ems/ems-core/src/main/resources/mapper/ems/ElecPvSupplyHMapper.xml

@@ -41,8 +41,16 @@
 
     <select id="selectPvSupplyHourlyList" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="PvSupplyVOResult">
         SELECT
-        pv.area_code,
-        a.area_name,
+        <choose>
+            <when test="queryMeter.areaCode != null and queryMeter.areaCode != '' and queryMeter.areaCode != '-1'">
+                pv.area_code,
+                a.area_name,
+            </when>
+            <otherwise>
+                '-1' as area_code,
+                '全部' as area_name,
+            </otherwise>
+        </choose>
         pv.date as statistic_date,
         pv.time_index,
         CONCAT(LPAD(pv.time_index - 1, 2, '0'), ':00') as statistic_hour,
@@ -69,15 +77,27 @@
             </if>
             AND pv.date IS NOT NULL
         </where>
-        GROUP BY pv.area_code, a.area_name, pv.date, pv.time_index
-        ORDER BY pv.time_index ${queryMeter.orderFlag}
+        GROUP BY
+        <if test="queryMeter.areaCode != null and queryMeter.areaCode != '' and queryMeter.areaCode != '-1'">
+            pv.area_code, a.area_name,
+        </if>
+        pv.date, pv.time_index
+        ORDER BY pv.date DESC, pv.time_index ${queryMeter.orderFlag}
     </select>
 
     <!-- ==================== 光伏产能按日汇总统计 ==================== -->
     <select id="selectPvSupplyDailyList" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="PvSupplyVOResult">
         SELECT
-        pv.area_code,
-        a.area_name,
+        <choose>
+            <when test="queryMeter.areaCode != null and queryMeter.areaCode != '' and queryMeter.areaCode != '-1'">
+                pv.area_code,
+                a.area_name,
+            </when>
+            <otherwise>
+                '-1' as area_code,
+                '全部' as area_name,
+            </otherwise>
+        </choose>
         pv.date as statistic_date,
         'DAY' as time_dimension,
         ROUND(SUM(COALESCE(pv.gen_elec_quantity, 0)), 2) as gen_elec_quantity,
@@ -99,15 +119,27 @@
             </if>
             AND pv.date IS NOT NULL
         </where>
-        GROUP BY pv.area_code, a.area_name, pv.date
-        ORDER BY pv.date ${queryMeter.orderFlag}, pv.area_code
+        GROUP BY
+        <if test="queryMeter.areaCode != null and queryMeter.areaCode != '' and queryMeter.areaCode != '-1'">
+            pv.area_code, a.area_name,
+        </if>
+        pv.date
+        ORDER BY pv.date ${queryMeter.orderFlag}
     </select>
 
     <!-- ==================== 光伏产能按月汇总统计 ==================== -->
     <select id="selectPvSupplyMonthlyList" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="PvSupplyVOResult">
         SELECT
-        pv.area_code,
-        a.area_name,
+        <choose>
+            <when test="queryMeter.areaCode != null and queryMeter.areaCode != '' and queryMeter.areaCode != '-1'">
+                pv.area_code,
+                a.area_name,
+            </when>
+            <otherwise>
+                '-1' as area_code,
+                '全部' as area_name,
+            </otherwise>
+        </choose>
         DATE(CONCAT(DATE_FORMAT(pv.date, '%Y-%m'), '-01')) as statistic_date,
         DATE_FORMAT(pv.date, '%Y-%m') as statistic_month,
         'MONTH' as time_dimension,
@@ -130,15 +162,27 @@
             </if>
             AND pv.date IS NOT NULL
         </where>
-        GROUP BY pv.area_code, a.area_name, DATE_FORMAT(pv.date, '%Y-%m')
-        ORDER BY DATE_FORMAT(pv.date, '%Y-%m') ${queryMeter.orderFlag}, pv.area_code
+        GROUP BY
+        <if test="queryMeter.areaCode != null and queryMeter.areaCode != '' and queryMeter.areaCode != '-1'">
+            pv.area_code, a.area_name,
+        </if>
+        DATE_FORMAT(pv.date, '%Y-%m')
+        ORDER BY DATE_FORMAT(pv.date, '%Y-%m') ${queryMeter.orderFlag}
     </select>
 
     <!-- ==================== 光伏产能按年汇总统计 ==================== -->
     <select id="selectPvSupplyYearlyList" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="PvSupplyVOResult">
         SELECT
-        pv.area_code,
-        a.area_name,
+        <choose>
+            <when test="queryMeter.areaCode != null and queryMeter.areaCode != '' and queryMeter.areaCode != '-1'">
+                pv.area_code,
+                a.area_name,
+            </when>
+            <otherwise>
+                '-1' as area_code,
+                '全部' as area_name,
+            </otherwise>
+        </choose>
         DATE(CONCAT(YEAR(pv.date), '-01-01')) as statistic_date,
         YEAR(pv.date) as statistic_year,
         'YEAR' as time_dimension,
@@ -161,8 +205,12 @@
             </if>
             AND pv.date IS NOT NULL
         </where>
-        GROUP BY pv.area_code, a.area_name, YEAR(pv.date)
-        ORDER BY YEAR(pv.date) ${queryMeter.orderFlag}, pv.area_code
+        GROUP BY
+        <if test="queryMeter.areaCode != null and queryMeter.areaCode != '' and queryMeter.areaCode != '-1'">
+            pv.area_code, a.area_name,
+        </if>
+        YEAR(pv.date)
+        ORDER BY YEAR(pv.date) ${queryMeter.orderFlag}
     </select>
 
     <!-- ==================== 光伏产能汇总统计 ==================== -->