Răsfoiți Sursa

+ 首页接口

chen.cheng 1 lună în urmă
părinte
comite
9dc45e0910

+ 7 - 0
bd-park/park-backend/park-application/src/main/resources/application-hm.yml

@@ -104,3 +104,10 @@ mqtt:
 bd:
   mqtt:
     enabled: true
+
+evt-fusion:
+  thread-pool-size: 2
+  video-trail-engine:
+    enable: false
+  uwb-tag-listener:
+    enable: true

+ 1 - 1
common-cloud/ruoyi-modules/ruoyi-gen/src/main/resources/application-local.yml

@@ -6,7 +6,7 @@ spring:
     password:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.192.10.105:30002/sys_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.192.10.105:30002/ems_ct?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
     password: root
 

+ 2 - 2
common-cloud/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -14,13 +14,13 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 172.192.10.105:30003
-        group: ems
+        namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
         #server-addr: 172.10.0.71:8848
         #group: public
       config:
         # 配置中心地址
         server-addr: 172.192.10.105:30003
-        group: ems
+        namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
         #server-addr: 172.10.0.71:8848
         #group: public
         # 配置文件格式

+ 10 - 15
ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/WaterMeterHController.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,15 +27,14 @@ import java.util.List;
 
 /**
  * 用水计量-小时Controller
- * 
+ *
  * @author ruoyi
  * @date 2024-12-03
  */
 @RestController
 @RequestMapping("/ems/waterMeterH")
 @Api(value = "WaterMeterHController", description = "用水计量-小时")
-public class WaterMeterHController extends BaseController
-{
+public class WaterMeterHController extends BaseController {
     @Autowired
     private IWaterMeterHService waterMeterHService;
 
@@ -42,9 +42,8 @@ public class WaterMeterHController extends BaseController
      * 查询用水计量-小时列表
      */
     @PreAuthorize("@ss.hasPermi('ems:waterMeterH:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(QueryMeter queryMeter)
-    {
+    @GetMapping("/list1")
+    public TableDataInfo list(QueryMeter queryMeter) {
         startPage();
         List<WaterMeterH> list = waterMeterHService.selectWaterMeterHList(queryMeter);
         return getDataTable(list);
@@ -56,8 +55,7 @@ public class WaterMeterHController extends BaseController
     @PreAuthorize("@ss.hasPermi('ems:waterMeterH:export')")
     @Log(title = "用水计量-小时", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, QueryMeter queryMeter)
-    {
+    public void export(HttpServletResponse response, QueryMeter queryMeter) {
         List<WaterMeterH> list = waterMeterHService.selectWaterMeterHList(queryMeter);
         ExcelUtil<WaterMeterH> util = new ExcelUtil<WaterMeterH>(WaterMeterH.class);
         util.exportExcel(response, list, "用水计量-小时数据");
@@ -69,8 +67,7 @@ public class WaterMeterHController extends BaseController
     @PreAuthorize("@ss.hasPermi('ems:waterMeterH:add')")
     @Log(title = "用水计量-小时", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody WaterMeterH waterMeterH)
-    {
+    public AjaxResult add(@RequestBody WaterMeterH waterMeterH) {
         return toAjax(waterMeterHService.insertWaterMeterH(waterMeterH));
     }
 
@@ -80,8 +77,7 @@ public class WaterMeterHController extends BaseController
     @PreAuthorize("@ss.hasPermi('ems:waterMeterH:edit')")
     @Log(title = "用水计量-小时", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody WaterMeterH waterMeterH)
-    {
+    public AjaxResult edit(@RequestBody WaterMeterH waterMeterH) {
         return toAjax(waterMeterHService.updateWaterMeterH(waterMeterH));
     }
 
@@ -90,9 +86,8 @@ public class WaterMeterHController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('ems:waterMeterH:remove')")
     @Log(title = "用水计量-小时", businessType = BusinessType.DELETE)
-	@DeleteMapping("/delByDate")
-    public AjaxResult remove(@RequestParam(name = "date") String date)
-    {
+    @DeleteMapping("/delByDate")
+    public AjaxResult remove(@RequestParam(name = "date") String date) {
         return toAjax(waterMeterHService.deleteWaterMeterHByDate(date));
     }
 }

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

@@ -18,6 +18,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -72,7 +73,7 @@ public class ElecMeterHController extends BaseController {
 
         if (CollectionUtils.isNotEmpty(list)) {
             Map<String, ElecMeter> map = list.stream()
-                .collect(Collectors.toMap(ElecMeter::getObjName, Function.identity()));
+                    .collect(Collectors.toMap(ElecMeter::getObjName, Function.identity()));
             BigDecimal quantity = BigDecimal.ZERO;
             BigDecimal useCost = BigDecimal.ZERO;
 
@@ -95,8 +96,7 @@ public class ElecMeterHController extends BaseController {
             jsonObject.put("normalElec", normalElec);
             jsonObject.put("highElec", highElec);
             jsonObject.put("peakElec", peakElec);
-        }
-        else {
+        } else {
             jsonObject.put("total", new ElecMeter("total", "total", 0.0, 0.0));
             jsonObject.put("lowElec", new ElecMeter("-1", "lowElec", 0.0, 0.0));
             jsonObject.put("normalElec", new ElecMeter("0", "normalElec", 0.0, 0.0));
@@ -173,4 +173,19 @@ public class ElecMeterHController extends BaseController {
     public AjaxResult removeByDate(@RequestParam(name = "date") String date) {
         return toAjax(elecMeterHService.deleteElecMeterHByDate(date));
     }
+
+    @GetMapping("/sum/byDate/{date}")
+    public AjaxResult qryElecMeterByDate(@PathVariable("date") String date) {
+        return success(elecMeterHService.qryElecMeterByDate(date));
+    }
+
+    @GetMapping("/sum/timeIndex/byDate/{date}")
+    public AjaxResult qryTimeIndexElecMeterByDay(@PathVariable("date") String date) {
+        return success(elecMeterHService.qryTimeIndexElecMeterByDay(date));
+    }
+
+    @GetMapping("/sum/date/byDate/{date}")
+    public AjaxResult qryDateElecMeterByDate(@PathVariable("date") String date) {
+        return success(elecMeterHService.qryDateElecMeterByDate(date));
+    }
 }

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,15 +27,14 @@ import java.util.List;
 
 /**
  * 用水计量-小时Controller
- * 
+ *
  * @author ruoyi
  * @date 2024-12-03
  */
 @RestController
 @RequestMapping("/waterMeterH")
 @Api(value = "WaterMeterHController", description = "用水计量-小时")
-public class WaterMeterHController extends BaseController
-{
+public class WaterMeterHController extends BaseController {
     @Autowired
     private IWaterMeterHService waterMeterHService;
 
@@ -43,8 +43,7 @@ public class WaterMeterHController extends BaseController
      */
     @RequiresPermissions("ems:waterMeterH:list")
     @GetMapping("/list")
-    public TableDataInfo list(QueryMeter queryMeter)
-    {
+    public TableDataInfo list(QueryMeter queryMeter) {
         startPage();
         List<WaterMeterH> list = waterMeterHService.selectWaterMeterHList(queryMeter);
         return getDataTable(list);
@@ -56,8 +55,7 @@ public class WaterMeterHController extends BaseController
     @RequiresPermissions("ems:waterMeterH:export")
     @Log(title = "用水计量-小时", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, QueryMeter queryMeter)
-    {
+    public void export(HttpServletResponse response, QueryMeter queryMeter) {
         List<WaterMeterH> list = waterMeterHService.selectWaterMeterHList(queryMeter);
         ExcelUtil<WaterMeterH> util = new ExcelUtil<WaterMeterH>(WaterMeterH.class);
         util.exportExcel(response, list, "用水计量-小时数据");
@@ -69,8 +67,7 @@ public class WaterMeterHController extends BaseController
     @RequiresPermissions("ems:waterMeterH:add")
     @Log(title = "用水计量-小时", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody WaterMeterH waterMeterH)
-    {
+    public AjaxResult add(@RequestBody WaterMeterH waterMeterH) {
         return toAjax(waterMeterHService.insertWaterMeterH(waterMeterH));
     }
 
@@ -80,8 +77,7 @@ public class WaterMeterHController extends BaseController
     @RequiresPermissions("ems:waterMeterH:edit")
     @Log(title = "用水计量-小时", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody WaterMeterH waterMeterH)
-    {
+    public AjaxResult edit(@RequestBody WaterMeterH waterMeterH) {
         return toAjax(waterMeterHService.updateWaterMeterH(waterMeterH));
     }
 
@@ -90,9 +86,24 @@ public class WaterMeterHController extends BaseController
      */
     @RequiresPermissions("ems:waterMeterH:remove")
     @Log(title = "用水计量-小时", businessType = BusinessType.DELETE)
-	@DeleteMapping("/delByDate")
-    public AjaxResult remove(@RequestParam(name = "date") String date)
-    {
+    @DeleteMapping("/delByDate")
+    public AjaxResult remove(@RequestParam(name = "date") String date) {
         return toAjax(waterMeterHService.deleteWaterMeterHByDate(date));
     }
+
+
+    @GetMapping("/sum/byDate/{date}")
+    public AjaxResult qryWaterMeterByDate(@PathVariable(name = "date") String date) {
+        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/date/byDate/{date}")
+    public AjaxResult qryDateWaterMeterByDay(@PathVariable(name = "date") String date) {
+        return success(waterMeterHService.qryDateWaterMeterByDay(date));
+    }
 }

+ 2 - 2
ems/ems-cloud/ems-server/src/main/resources/bootstrap.yml

@@ -16,11 +16,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: ${env-nacos-server:172.192.10.105:30003}
-        namespace: ${env-nacos-namespace:null}
+        namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
       config:
         # 配置中心地址
         server-addr: ${env-nacos-server:172.192.10.105:30003}
-        namespace: ${env-nacos-namespace:null}
+        namespace: ${env-nacos-namespace:2c519718-1e09-4de4-9af5-d07f837372d6}
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -32,6 +32,7 @@ public interface ElecMeterHMapper {
 
     /**
      * 查询最近一条计量
+     *
      * @param deviceCode 设备编码
      * @return 用电计量
      */
@@ -47,6 +48,7 @@ public interface ElecMeterHMapper {
 
     /**
      * 根据时间统计
+     *
      * @param queryMeter 查询条件
      * @return 统计
      */
@@ -83,4 +85,11 @@ public interface ElecMeterHMapper {
      * @return 结果
      */
     int deleteElecMeterHByDate(@Param("date") String date);
+
+
+    ElecMeterH qryElecMeterByDate(String dataRange);
+
+    List<ElecMeterH> qryTimeIndexElecMeterByDay(String dataRange);
+
+    List<ElecMeterH> qryDateElecMeterByDate(String dataRange);
 }

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

@@ -52,4 +52,11 @@ public interface WaterMeterHMapper {
      * @return 结果
      */
     int deleteWaterMeterHByDate(@Param("date") String date);
+
+
+    WaterMeterH qryWaterMeterByDate(String dataRange);
+
+    List<WaterMeterH> qryTimeIndexWaterMeterByDay(String dataRange);
+
+    List<WaterMeterH> qryDateWaterMeterByDay(String dataRange);
 }

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

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
-import com.ruoyi.ems.domain.ElecMeterH;
 import com.ruoyi.ems.domain.ElecMeter;
+import com.ruoyi.ems.domain.ElecMeterH;
 import com.ruoyi.ems.model.QueryMeter;
 
 import java.util.List;
@@ -31,6 +31,7 @@ public interface IElecMeterHService {
 
     /**
      * 统计用电计量-根据时间
+     *
      * @param queryMeter 查询条件
      * @return 用电统计
      */
@@ -46,6 +47,7 @@ public interface IElecMeterHService {
 
     /**
      * 查询最近的一条记录
+     *
      * @param deviceCode 设备编码
      * @return 用电计量-小时集合
      */
@@ -82,4 +84,11 @@ public interface IElecMeterHService {
      * @return 结果
      */
     int deleteElecMeterHByDate(String date);
+
+
+    ElecMeterH qryElecMeterByDate(String dateRange);
+
+    List<ElecMeterH> qryTimeIndexElecMeterByDay(String dateRange);
+
+    List<ElecMeterH> qryDateElecMeterByDate(String dateRange);
 }

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

@@ -44,4 +44,11 @@ public interface IWaterMeterHService {
      * @return 结果
      */
     int deleteWaterMeterHByDate(String date);
+
+
+    WaterMeterH qryWaterMeterByDate(String dataRange);
+
+    List<WaterMeterH> qryTimeIndexWaterMeterByDay(String dataRange);
+
+    List<WaterMeterH> qryDateWaterMeterByDay(String dataRange);
 }

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

@@ -101,4 +101,19 @@ public class ElecMeterHServiceImpl implements IElecMeterHService {
     public int deleteElecMeterHByDate(String date) {
         return elecMeterHMapper.deleteElecMeterHByDate(date);
     }
+
+    @Override
+    public ElecMeterH qryElecMeterByDate(String dateRange) {
+        return elecMeterHMapper.qryElecMeterByDate(dateRange);
+    }
+
+    @Override
+    public List<ElecMeterH> qryTimeIndexElecMeterByDay(String dateRange) {
+        return elecMeterHMapper.qryTimeIndexElecMeterByDay(dateRange);
+    }
+
+    @Override
+    public List<ElecMeterH> qryDateElecMeterByDate(String dateRange) {
+        return elecMeterHMapper.qryDateElecMeterByDate(dateRange);
+    }
 }

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

@@ -12,62 +12,73 @@ import java.util.List;
 
 /**
  * 用水计量-小时Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2024-12-03
  */
 @Service
-public class WaterMeterHServiceImpl implements IWaterMeterHService 
-{
+public class WaterMeterHServiceImpl implements IWaterMeterHService {
     @Autowired
     private WaterMeterHMapper waterMeterHMapper;
 
     /**
      * 查询用水计量-小时列表
-     * 
+     *
      * @param queryMeter 用水计量-小时
      * @return 用水计量-小时
      */
     @Override
-    public List<WaterMeterH> selectWaterMeterHList(QueryMeter queryMeter)
-    {
+    public List<WaterMeterH> selectWaterMeterHList(QueryMeter queryMeter) {
         return waterMeterHMapper.selectWaterMeterHList(queryMeter);
     }
 
     /**
      * 新增用水计量-小时
-     * 
+     *
      * @param waterMeterH 用水计量-小时
      * @return 结果
      */
     @Override
-    public int insertWaterMeterH(WaterMeterH waterMeterH)
-    {
+    public int insertWaterMeterH(WaterMeterH waterMeterH) {
         waterMeterH.setCreateTime(DateUtils.getNowDate());
         return waterMeterHMapper.insertWaterMeterH(waterMeterH);
     }
 
     /**
      * 修改用水计量-小时
-     * 
+     *
      * @param waterMeterH 用水计量-小时
      * @return 结果
      */
     @Override
-    public int updateWaterMeterH(WaterMeterH waterMeterH)
-    {
+    public int updateWaterMeterH(WaterMeterH waterMeterH) {
         return waterMeterHMapper.updateWaterMeterH(waterMeterH);
     }
 
     /**
      * 删除用水计量-小时信息
-     * 
+     *
      * @param date 日期
      * @return 结果
      */
     @Override
-    public int deleteWaterMeterHByDate(String date)
-    {
+    public int deleteWaterMeterHByDate(String date) {
         return waterMeterHMapper.deleteWaterMeterHByDate(date);
     }
+
+
+    @Override
+    public WaterMeterH qryWaterMeterByDate(String dataRange) {
+        return waterMeterHMapper.qryWaterMeterByDate(dataRange);
+    }
+
+    @Override
+    public List<WaterMeterH> qryTimeIndexWaterMeterByDay(String dataRange) {
+        return waterMeterHMapper.qryTimeIndexWaterMeterByDay(dataRange);
+    }
+
+    @Override
+    public List<WaterMeterH> qryDateWaterMeterByDay(String dataRange) {
+        return waterMeterHMapper.qryDateWaterMeterByDay(dataRange);
+    }
 }

+ 42 - 13
ems/ems-core/src/main/resources/mapper/ems/ElecMeterHMapper.xml

@@ -95,7 +95,7 @@
 
     <select id="selectElecMeterSumByDev" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="ElecMeterResult">
         select
-         area_code,
+        area_code,
         '${objType}' as obj_type,
         '${objCode}' as obj_code,
         '${objName}' as obj_name,
@@ -118,17 +118,17 @@
 
     <select id="selectStaByTime" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="ElecMeterResult">
         SELECT
-            meter_type as obj_code,
-            CASE
-                WHEN meter_type = -1 THEN 'lowElec'
-                WHEN meter_type = 0 THEN 'normalElec'
-                WHEN meter_type = 1 THEN 'highElec'
-                WHEN meter_type = 2 THEN 'peakElec'
-                END AS obj_name,
-            ROUND(SUM(elec_quantity),2) AS elec_quantity,
-            ROUND(SUM(use_elec_cost),3) AS use_elec_cost
+        meter_type as obj_code,
+        CASE
+        WHEN meter_type = -1 THEN 'lowElec'
+        WHEN meter_type = 0 THEN 'normalElec'
+        WHEN meter_type = 1 THEN 'highElec'
+        WHEN meter_type = 2 THEN 'peakElec'
+        END AS obj_name,
+        ROUND(SUM(elec_quantity),2) AS elec_quantity,
+        ROUND(SUM(use_elec_cost),3) AS use_elec_cost
         FROM
-            adm_elec_meter_h
+        adm_elec_meter_h
         <where>
             <if test="deviceCode != null  and deviceCode != ''">and device_code = #{deviceCode}</if>
             <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime != ''">
@@ -180,10 +180,12 @@
     </insert>
 
     <insert id="insertBatch" parameterType="java.util.List">
-        insert into adm_elec_meter_h (area_code, device_code, record_time, `date`, `time`, time_index, elec_quantity, meter_type, meter_unit_price, use_elec_cost, meter_reading)
+        insert into adm_elec_meter_h (area_code, device_code, record_time, `date`, `time`, time_index, elec_quantity,
+        meter_type, meter_unit_price, use_elec_cost, meter_reading)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.areaCode}, #{item.deviceCode}, #{item.recordTime}, #{item.date}, #{item.time}, #{item.timeIndex}, #{item.elecQuantity}, #{item.meterType}, #{item.meterUnitPrice}, #{item.useElecCost}, #{item.meterReading})
+            (#{item.areaCode}, #{item.deviceCode}, #{item.recordTime}, #{item.date}, #{item.time}, #{item.timeIndex},
+            #{item.elecQuantity}, #{item.meterType}, #{item.meterUnitPrice}, #{item.useElecCost}, #{item.meterReading})
         </foreach>
     </insert>
 
@@ -210,4 +212,31 @@
         from adm_elec_meter_h
         where `date` = #{date}
     </delete>
+
+
+    <select id="qryElecMeterByDate" resultMap="ElecMeterHResult">
+        SELECT sum(elec_quantity) elec_quantity,
+               SUM(elec_quantity * aemh.meter_unit_price),
+               SUM(use_elec_cost) use_elec_cost
+        from adm_elec_meter_h aemh
+        where `date` like concat(#{dataRange}, '%')
+    </select>
+
+    <select id="qryTimeIndexElecMeterByDay" resultMap="ElecMeterHResult">
+        SELECT sum(elec_quantity) elec_quantity,
+               time_index
+        from adm_elec_meter_h aemh
+        where `date` = #{dataRange}
+        GROUP by time_index
+        order by time_index desc
+    </select>
+    <select id="qryDateElecMeterByDate" resultMap="ElecMeterHResult">
+        SELECT sum(elec_quantity) elec_quantity,
+               `date`
+        from adm_elec_meter_h aemh
+        where `date` like concat(#{dataRange}, '%')
+        GROUP by `date`
+        order by date asc
+    </select>
+
 </mapper>

+ 26 - 0
ems/ems-core/src/main/resources/mapper/ems/WaterMeterHMapper.xml

@@ -113,4 +113,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteWaterMeterHByDate" parameterType="String">
         delete from adm_water_meter_h where `date` = #{date}
     </delete>
+
+    <select id="qryWaterMeterByDate" resultMap="WaterMeterHResult">
+        SELECT sum(water_quantity) water_quantity,
+               SUM(water_quantity * aemh.meter_unit_price),
+               SUM(use_water_cost) use_water_cost
+        from adm_water_meter_h aemh
+        where `date` like concat(#{dataRange}, '%')
+
+    </select>
+
+    <select id="qryTimeIndexWaterMeterByDay" resultMap="WaterMeterHResult">
+        SELECT sum(water_quantity) water_quantity,
+               time_index
+        from adm_water_meter_h aemh
+        where `date` like concat(#{dataRange}, '%')
+        GROUP by time_index
+        order by time_index asc
+    </select>
+
+    <select id="qryDateWaterMeterByDay" resultMap="WaterMeterHResult">
+        SELECT sum(water_quantity) water_quantity, `date`
+        from adm_water_meter_h aemh
+        where `date` like concat(#{dataRange}, '%')
+        GROUP by `date`
+        order by `date` asc
+    </select>
 </mapper>