+ 首页接口

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

@@ -179,9 +179,9 @@ public class ElecMeterHController extends BaseController {
         return success(elecMeterHService.qryElecMeterByDate(date));
     }
 
-    @GetMapping("/sum/timeIndex/byDate/{date}")
-    public AjaxResult qryTimeIndexElecMeterByDay(@PathVariable("date") String date) {
-        return success(elecMeterHService.qryTimeIndexElecMeterByDay(date));
+    @GetMapping("/sum/timeIndex/byDate/{date}/{timeIndex}")
+    public AjaxResult qryTimeIndexElecMeterByDay(@PathVariable("date") String date,@PathVariable("timeIndex") Integer timeIndex) {
+        return success(elecMeterHService.qryTimeIndexElecMeterByDay(date,timeIndex));
     }
 
     @GetMapping("/sum/date/byDate/{date}")

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

@@ -97,9 +97,10 @@ public class WaterMeterHController extends BaseController {
         return success(waterMeterHService.qryWaterMeterByDate(date));
     }
 
-    @GetMapping("/sum/timeIndex/byDate/{date}")
-    public AjaxResult qryTimeIndexWaterMeterByDay(@PathVariable(name = "date") String date) {
-        return success(waterMeterHService.qryTimeIndexWaterMeterByDay(date));
+    @GetMapping("/sum/timeIndex/byDate/{date}/{timeIndex}")
+    public AjaxResult qryTimeIndexWaterMeterByDay(@PathVariable(name = "date") String date,
+                                                  @PathVariable(name = "timeIndex") Integer timeIndex) {
+        return success(waterMeterHService.qryTimeIndexWaterMeterByDay(date, timeIndex));
     }
 
     @GetMapping("/sum/date/byDate/{date}")

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

@@ -89,7 +89,7 @@ public interface ElecMeterHMapper {
 
     ElecMeterH qryElecMeterByDate(String dataRange);
 
-    List<ElecMeterH> qryTimeIndexElecMeterByDay(String dataRange);
+    List<ElecMeterH> qryTimeIndexElecMeterByDay(@Param("dataRange") String dataRange);
 
     List<ElecMeterH> qryDateElecMeterByDate(String dataRange);
 }

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

@@ -56,7 +56,7 @@ public interface WaterMeterHMapper {
 
     WaterMeterH qryWaterMeterByDate(String dataRange);
 
-    List<WaterMeterH> qryTimeIndexWaterMeterByDay(String dataRange);
+    List<WaterMeterH> qryTimeIndexWaterMeterByDay(@Param("dataRange") String dataRange);
 
     List<WaterMeterH> qryDateWaterMeterByDay(String dataRange);
 }

ems/ems-core/src/main/java/com/ruoyi/ems/service/IElecMeterHService.java

@@ -88,7 +88,7 @@ public interface IElecMeterHService {
 
     ElecMeterH qryElecMeterByDate(String dateRange);
 
-    List<ElecMeterH> qryTimeIndexElecMeterByDay(String dateRange);
+    List<ElecMeterH> qryTimeIndexElecMeterByDay(String dateRange,Integer timeIndex);
 
     List<ElecMeterH> qryDateElecMeterByDate(String dateRange);
 }

ems/ems-core/src/main/java/com/ruoyi/ems/service/IWaterMeterHService.java

@@ -48,7 +48,7 @@ public interface IWaterMeterHService {
 
     WaterMeterH qryWaterMeterByDate(String dataRange);
 
-    List<WaterMeterH> qryTimeIndexWaterMeterByDay(String dataRange);
+    List<WaterMeterH> qryTimeIndexWaterMeterByDay(String dataRange,Integer timeIndex);
 
     List<WaterMeterH> qryDateWaterMeterByDay(String dataRange);
 }

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/ElecMeterHServiceImpl.java

@@ -108,7 +108,7 @@ public class ElecMeterHServiceImpl implements IElecMeterHService {
     }
 
     @Override
-    public List<ElecMeterH> qryTimeIndexElecMeterByDay(String dateRange) {
+    public List<ElecMeterH> qryTimeIndexElecMeterByDay(String dateRange,Integer timeIndex) {
         return elecMeterHMapper.qryTimeIndexElecMeterByDay(dateRange);
     }
 

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/WaterMeterHServiceImpl.java

@@ -73,7 +73,7 @@ public class WaterMeterHServiceImpl implements IWaterMeterHService {
     }
 
     @Override
-    public List<WaterMeterH> qryTimeIndexWaterMeterByDay(String dataRange) {
+    public List<WaterMeterH> qryTimeIndexWaterMeterByDay(String dataRange, Integer timeIndex) {
         return waterMeterHMapper.qryTimeIndexWaterMeterByDay(dataRange);
     }
 

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

@@ -224,11 +224,12 @@
 
     <select id="qryTimeIndexElecMeterByDay" resultMap="ElecMeterHResult">
         SELECT sum(elec_quantity) elec_quantity,
-               time_index
+               time_index,
+               `date`
         from adm_elec_meter_h aemh
-        where `date` = #{dataRange}
-        GROUP by time_index
-        order by time_index desc
+        where `date` >= #{dataRange}
+        GROUP by `date`, time_index
+        order by `date`, time_index
     </select>
     <select id="qryDateElecMeterByDate" resultMap="ElecMeterHResult">
         SELECT sum(elec_quantity) elec_quantity,
@@ -236,7 +237,7 @@
         from adm_elec_meter_h aemh
         where `date` like concat(#{dataRange}, '%')
         GROUP by `date`
-        order by date asc
+        order by `date` asc
     </select>
 
 </mapper>

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

@@ -125,17 +125,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="qryTimeIndexWaterMeterByDay" resultMap="WaterMeterHResult">
         SELECT sum(water_quantity) water_quantity,
-               time_index
+               time_index,
+               `date`
         from adm_water_meter_h aemh
-        where `date` like concat(#{dataRange}, '%')
-        GROUP by time_index
-        order by time_index asc
+        where `date` >= #{dataRange}
+        GROUP by `date`, time_index
+        order by `date`, time_index
     </select>
 
     <select id="qryDateWaterMeterByDay" resultMap="WaterMeterHResult">
         SELECT sum(water_quantity) water_quantity, `date`
         from adm_water_meter_h aemh
-        where `date` like concat(#{dataRange}, '%')
+        where `date` >= #{dataRange}
         GROUP by `date`
         order by `date` asc
     </select>