+ 首页接口

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

@@ -180,12 +180,18 @@ public class ElecMeterHController extends BaseController {
     }
 
     @GetMapping("/sum/timeIndex/byDate/{date}/{timeIndex}")
-    public AjaxResult qryTimeIndexElecMeterByDay(@PathVariable("date") String date,@PathVariable("timeIndex") Integer timeIndex) {
-        return success(elecMeterHService.qryTimeIndexElecMeterByDay(date,timeIndex));
+    public AjaxResult qryTimeIndexElecMeterByDay(@PathVariable("date") String date, @PathVariable("timeIndex") Integer timeIndex) {
+        return success(elecMeterHService.qryTimeIndexElecMeterByDay(date, timeIndex));
     }
 
     @GetMapping("/sum/date/byDate/{date}")
     public AjaxResult qryDateElecMeterByDate(@PathVariable("date") String date) {
         return success(elecMeterHService.qryDateElecMeterByDate(date));
     }
+
+    @GetMapping("/sum/date/byYear/{date}")
+    public AjaxResult qryDateElecMeterByYear(@PathVariable("date") String date) {
+        return success(elecMeterHService.qryDateElecMeterByYear(date));
+    }
+
 }

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

@@ -107,4 +107,9 @@ public class WaterMeterHController extends BaseController {
     public AjaxResult qryDateWaterMeterByDay(@PathVariable(name = "date") String date) {
         return success(waterMeterHService.qryDateWaterMeterByDay(date));
     }
+
+    @GetMapping("/sum/date/byYear/{date}")
+    public AjaxResult qryDateWaterMeterByYear(@PathVariable(name = "date") String date) {
+        return success(waterMeterHService.qryDateWaterMeterByYear(date));
+    }
 }

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

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

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

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

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

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

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

@@ -51,4 +51,6 @@ public interface IWaterMeterHService {
     List<WaterMeterH> qryTimeIndexWaterMeterByDay(String dataRange,Integer timeIndex);
 
     List<WaterMeterH> qryDateWaterMeterByDay(String dataRange);
+
+    List<WaterMeterH> qryDateWaterMeterByYear(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,Integer timeIndex) {
+    public List<ElecMeterH> qryTimeIndexElecMeterByDay(String dateRange, Integer timeIndex) {
         return elecMeterHMapper.qryTimeIndexElecMeterByDay(dateRange);
     }
 
@@ -116,4 +116,9 @@ public class ElecMeterHServiceImpl implements IElecMeterHService {
     public List<ElecMeterH> qryDateElecMeterByDate(String dateRange) {
         return elecMeterHMapper.qryDateElecMeterByDate(dateRange);
     }
+
+    @Override
+    public List<ElecMeterH> qryDateElecMeterByYear(String dataRange) {
+        return elecMeterHMapper.qryDateElecMeterByYear(dataRange);
+    }
 }

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

@@ -81,4 +81,11 @@ public class WaterMeterHServiceImpl implements IWaterMeterHService {
     public List<WaterMeterH> qryDateWaterMeterByDay(String dataRange) {
         return waterMeterHMapper.qryDateWaterMeterByDay(dataRange);
     }
+
+    @Override
+    public List<WaterMeterH> qryDateWaterMeterByYear(String dataRange) {
+        return waterMeterHMapper.qryDateWaterMeterByYear(dataRange);
+    }
+
+
 }

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

@@ -223,7 +223,7 @@
     </select>
 
     <select id="qryTimeIndexElecMeterByDay" resultMap="ElecMeterHResult">
-        SELECT sum(elec_quantity) elec_quantity,
+        SELECT sum(use_elec_cost) use_elec_cost,
                time_index,
                `date`
         from adm_elec_meter_h aemh
@@ -232,12 +232,25 @@
         order by `date`, time_index
     </select>
     <select id="qryDateElecMeterByDate" resultMap="ElecMeterHResult">
-        SELECT sum(elec_quantity) elec_quantity,
+        SELECT sum(use_elec_cost) use_elec_cost,
                `date`
         from adm_elec_meter_h aemh
-        where `date` like concat(#{dataRange}, '%')
+        where `date` >= #{dataRange}
         GROUP by `date`
         order by `date` asc
     </select>
 
+    <select id="qryDateElecMeterByYear" resultMap="ElecMeterHResult">
+        SELECT
+            sum(use_elec_cost) use_elec_cost,
+            DATE_FORMAT(`date`, '%Y-%m') as startRecTime
+        from
+            adm_elec_meter_h aemh
+        where
+            `date` >= #{dataRange}
+        GROUP by
+            startRecTime
+        order by
+            startRecTime asc
+    </select>
 </mapper>

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

@@ -15,8 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="timeIndex"    column="time_index"    />
         <result property="waterQuantity"    column="water_quantity"    />
         <result property="meterUnitPrice"    column="meter_unit_price"    />
-        <result property="useWaterCost"    column="use_water_cost"    />
         <result property="createTime"    column="create_time"    />
+        <result property="useWaterCost"    column="use_water_cost"    />
     </resultMap>
 
     <sql id="selectWaterMeterHVo">
@@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="qryTimeIndexWaterMeterByDay" resultMap="WaterMeterHResult">
-        SELECT sum(water_quantity) water_quantity,
+        SELECT sum(use_water_cost) use_water_cost,
                time_index,
                `date`
         from adm_water_meter_h aemh
@@ -134,10 +134,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="qryDateWaterMeterByDay" resultMap="WaterMeterHResult">
-        SELECT sum(water_quantity) water_quantity, `date`
+        SELECT sum(use_water_cost) use_water_cost,
+               `date`
         from adm_water_meter_h aemh
         where `date` >= #{dataRange}
         GROUP by `date`
         order by `date` asc
     </select>
+
+    <select id="qryDateWaterMeterByYear" resultMap="WaterMeterHResult">
+        SELECT
+            sum(use_water_cost) use_water_cost,
+            DATE_FORMAT(`date`, '%Y-%m') as startRecTime
+        from
+            adm_water_meter_h aemh
+        where
+            `date` >= #{dataRange}
+        GROUP by
+            startRecTime
+        order by
+            startRecTime asc
+    </select>
 </mapper>