大屏能耗

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyDataServiceImpl.java

@@ -398,6 +398,10 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         List<EnergyAllDataVo> energyFeedDataVos = dataMapper.listDayFeed(queryWrapper2.isNotNull("feed_value"));
         List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listDayWater(queryWrapper3.isNotNull("water_value"));
         List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listDayElectricity(queryWrapper4.isNotNull("electricity_value"));
+        Collections.reverse(energyGasDataVos);
+        Collections.reverse(energyFeedDataVos);
+        Collections.reverse(energyWaterDataVos);
+        Collections.reverse(energyElectricityDataVos);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("gas", energyGasDataVos);
         jsonObject.put("water", energyWaterDataVos);

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnergyDataMapper.xml

@@ -111,7 +111,8 @@
         SELECT Convert((IFNUll(sum(gas_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
-        ORDER BY create_date ASC
+        ORDER BY create_date DESC
+        LIMIT 30
     </select>
 
     <select id="listYearFeed" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
@@ -124,7 +125,8 @@
         SELECT Convert((IFNUll(sum(feed_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
-        ORDER BY create_date ASC
+        ORDER BY create_date DESC
+        LIMIT 30
     </select>
     <select id="listYearWater" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
         SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
@@ -136,7 +138,8 @@
         SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
-        ORDER BY create_date ASC
+        ORDER BY create_date DESC
+        LIMIT 30
     </select>
     <select id="listYearElectricity" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
         SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
@@ -148,7 +151,8 @@
         SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
-        ORDER BY create_date ASC
+        ORDER BY create_date DESC
+        LIMIT 30
     </select>
 
     <select id="listDataCount" resultType="com.huimv.admin.entity.EnergyData">