refactor(property): 优化能源趋势查询接口返回值类型

2025-08-28 15:05:01 +08:00
parent 76c0aa74f1
commit cfff5df7d0
7 changed files with 89 additions and 50 deletions
--- a/ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml
+++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml
@@ -15,8 +15,8 @@
        <if test="meterId != '' and meterId != null">
            AND a.meter_id = #{meterId}
        </if>
-        GROUP BY CONCAT_WS(':', HOUR(reading_time), '00')
-        ORDER BY hour
+        GROUP BY CONCAT_WS(':', HOUR(reading_time), '00'), HOUR(reading_time)
+        ORDER BY HOUR(reading_time)
    </select>