抄表流程重构

ems/ems-application/ems-admin/src/main/java/com/ruoyi/web/controller/ems/ElecMeterHController.java

@@ -38,29 +38,6 @@ public class ElecMeterHController extends BaseController {
     private IElecMeterHService elecMeterHService;
 
     /**
-     * 查询用电计量-小时列表
-     */
-    @PreAuthorize("@ss.hasPermi('ems:elecMeterH:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(QueryMeter queryMeter) {
-        startPage();
-        List<ElecMeterH> list = elecMeterHService.selectByMeterDev(queryMeter);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出用电计量-小时列表
-     */
-    @PreAuthorize("@ss.hasPermi('ems:elecMeterH:export')")
-    @Log(title = "用电计量-小时", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, QueryMeter queryMeter) {
-        List<ElecMeterH> list = elecMeterHService.selectByMeterDev(queryMeter);
-        ExcelUtil<ElecMeterH> util = new ExcelUtil<ElecMeterH>(ElecMeterH.class);
-        util.exportExcel(response, list, "用电计量-小时数据");
-    }
-
-    /**
      * 新增用电计量-小时
      */
     @PreAuthorize("@ss.hasPermi('ems:elecMeterH:add')")

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

@@ -39,29 +39,6 @@ public class WaterMeterHController extends BaseController {
     private IWaterMeterHService waterMeterHService;
 
     /**
-     * 查询用水计量-小时列表
-     */
-    @PreAuthorize("@ss.hasPermi('ems:waterMeterH:list')")
-    @GetMapping("/list1")
-    public TableDataInfo list(QueryMeter queryMeter) {
-        startPage();
-        List<WaterMeterH> list = waterMeterHService.selectWaterMeterHList(queryMeter);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出用水计量-小时列表
-     */
-    @PreAuthorize("@ss.hasPermi('ems:waterMeterH:export')")
-    @Log(title = "用水计量-小时", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    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, "用水计量-小时数据");
-    }
-
-    /**
      * 新增用水计量-小时
      */
     @PreAuthorize("@ss.hasPermi('ems:waterMeterH:add')")

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

@@ -53,65 +53,6 @@ public class ElecMeterHController extends BaseController {
     private IBoundaryObjService boundaryObjService;
 
     /**
-     * 查询用电计量-小时列表
-     */
-    @RequiresPermissions("ems:elecMeterH:list")
-    @GetMapping("/list")
-    public TableDataInfo list(QueryMeter queryMeter) {
-        startPage();
-        List<ElecMeterH> list = elecMeterHService.selectByMeterDev(queryMeter);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询设施用能统计数据
-     *
-     * @param queryMeter 查询条件
-     * @return
-     */
-    @GetMapping("/staByTime")
-    public AjaxResult staByTime(QueryMeter queryMeter) {
-        List<EnergyMeter> list = elecMeterHService.staByTime(queryMeter);
-        JSONObject jsonObject = new JSONObject();
-
-        if (CollectionUtils.isNotEmpty(list)) {
-            Map<String, EnergyMeter> map = list.stream()
-                .collect(Collectors.toMap(EnergyMeter::getObjName, Function.identity()));
-            BigDecimal quantity = BigDecimal.ZERO;
-            BigDecimal useCost = BigDecimal.ZERO;
-
-            EnergyMeter lowElec = map.computeIfAbsent("lowElec", k -> new EnergyMeter("-1", "lowElec", 0.0, 0.0));
-            EnergyMeter normalElec = map.computeIfAbsent("normalElec", k -> new EnergyMeter("0", "normalElec", 0.0, 0.0));
-            EnergyMeter highElec = map.computeIfAbsent("highElec", k -> new EnergyMeter("1", "highElec", 0.0, 0.0));
-            EnergyMeter peakElec = map.computeIfAbsent("peakElec", k -> new EnergyMeter("-1", "peakElec", 0.0, 0.0));
-
-            quantity = quantity.add(new BigDecimal(String.valueOf(lowElec.getQuantity())));
-            useCost = useCost.add(new BigDecimal(String.valueOf(lowElec.getUseCost())));
-            quantity = quantity.add(new BigDecimal(String.valueOf(normalElec.getQuantity())));
-            useCost = useCost.add(new BigDecimal(String.valueOf(normalElec.getUseCost())));
-            quantity = quantity.add(new BigDecimal(String.valueOf(highElec.getQuantity())));
-            useCost = useCost.add(new BigDecimal(String.valueOf(highElec.getUseCost())));
-            quantity = quantity.add(new BigDecimal(String.valueOf(peakElec.getQuantity())));
-            useCost = useCost.add(new BigDecimal(String.valueOf(peakElec.getUseCost())));
-
-            jsonObject.put("total", new EnergyMeter("total", "total", quantity.doubleValue(), useCost.doubleValue()));
-            jsonObject.put("lowElec", lowElec);
-            jsonObject.put("normalElec", normalElec);
-            jsonObject.put("highElec", highElec);
-            jsonObject.put("peakElec", peakElec);
-        }
-        else {
-            jsonObject.put("total", new EnergyMeter("total", "total", 0.0, 0.0));
-            jsonObject.put("lowElec", new EnergyMeter("-1", "lowElec", 0.0, 0.0));
-            jsonObject.put("normalElec", new EnergyMeter("0", "normalElec", 0.0, 0.0));
-            jsonObject.put("highElec", new EnergyMeter("1", "highElec", 0.0, 0.0));
-            jsonObject.put("peakElec", new EnergyMeter("2", "peakElec", 0.0, 0.0));
-        }
-
-        return success(jsonObject);
-    }
-
-    /**
      * 查询设施用能统计数据
      *
      * @param queryMeter 查询条件
@@ -202,18 +143,6 @@ public class ElecMeterHController extends BaseController {
     }
 
     /**
-     * 导出用电计量-小时列表
-     */
-    @RequiresPermissions("ems:elecMeterH:export")
-    @Log(title = "用电计量-小时", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, QueryMeter queryMeter) {
-        List<ElecMeterH> list = elecMeterHService.selectByMeterDev(queryMeter);
-        ExcelUtil<ElecMeterH> util = new ExcelUtil<ElecMeterH>(ElecMeterH.class);
-        util.exportExcel(response, list, "用电计量-小时数据");
-    }
-
-    /**
      * 新增用电计量-小时
      */
     @RequiresPermissions("ems:elecMeterH:add")

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

@@ -8,6 +8,8 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.ElecMeterH;
+import com.ruoyi.ems.domain.WaterMeterH;
 import com.ruoyi.ems.model.ElecConsumptionExportVO;
 import com.ruoyi.ems.model.ElecConsumptionVO;
 import com.ruoyi.ems.model.QueryMeter;
@@ -45,19 +47,59 @@ public class EnergyConsumptionController extends BaseController {
     @Autowired
     private IWaterConsumptionService waterConsumptionService;
 
-    // ==================== 区域用电统计 ====================
-
     /**
      * 查询用电小时计量类型列表
      */
     @RequiresPermissions("ems:consumption:list")
-    @GetMapping("/area/elec/hourTypes")
+    @GetMapping("/elec/hourTypes")
     @ApiOperation("查询区域用电统计列表")
     public AjaxResult getElecHourTypes(@ApiParam("查询参数") QueryMeter queryMeter) {
         List<String> list = elecConsumptionService.getElecHourTypes(queryMeter);
         return success(list);
     }
 
+    // ==================== 电表计抄表查询 ====================
+
+    /**
+     * 查询电表计小时抄表列表
+     */
+    @RequiresPermissions("ems:consumption:list")
+    @GetMapping("/mdev/elec/hour/list")
+    @ApiOperation("查询电表小时抄表列表")
+    public TableDataInfo getMDevElecList(@ApiParam("查询参数") QueryMeter queryMeter) {
+        startPage();
+        List<ElecMeterH> list = elecConsumptionService.selectMDevElecConsumptionList(queryMeter);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询表计小时抄表列表
+     */
+    @RequiresPermissions("ems:consumption:list")
+    @GetMapping("/mdev/elec/hour/summary")
+    @ApiOperation("查询电表小时抄表统计")
+    public AjaxResult getMDevElecConsumptionSummary(@ApiParam("查询参数") QueryMeter queryMeter) {
+        ElecConsumptionVO summary  = elecConsumptionService.selectMDevElecConsumptionSummary(queryMeter);
+        return success(summary);
+    }
+
+    /**
+     * 导出区域用电统计数据
+     */
+    @RequiresPermissions("ems:consumption:export")
+    @Log(title = "区域用电统计", businessType = BusinessType.EXPORT)
+    @PostMapping("/mdev/elec/hour/export")
+    @ApiOperation("导出区域用电统计数据")
+    public void exportMDevElecList(HttpServletResponse response, @ApiParam("查询参数") QueryMeter queryMeter) {
+        List<ElecMeterH> list = elecConsumptionService.selectMDevElecConsumptionList(queryMeter);
+        ExcelUtil<ElecMeterH> util = new ExcelUtil<>(ElecMeterH.class);
+        String fileName = String.format("电表抄表_%s_%s.xlsx", queryMeter.getTimeDimension(),
+            System.currentTimeMillis());
+        util.exportExcel(response, list, fileName);
+    }
+
+    // ==================== 区域用电统计 ====================
+
     /**
      * 查询区域用电统计列表
      */
@@ -189,6 +231,46 @@ public class EnergyConsumptionController extends BaseController {
         util.exportExcel(response, exportList, fileName);
     }
 
+    // ==================== 水表计抄表查询 ====================
+
+    /**
+     * 查询电表计小时抄表列表
+     */
+    @RequiresPermissions("ems:consumption:list")
+    @GetMapping("/mdev/water/hour/list")
+    @ApiOperation("查询水表计小时抄表列表")
+    public TableDataInfo getMDevWaterList(@ApiParam("查询参数") QueryMeter queryMeter) {
+        startPage();
+        List<WaterMeterH> list = waterConsumptionService.selectMDevWaterConsumptionList(queryMeter);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询表计小时抄表列表
+     */
+    @RequiresPermissions("ems:consumption:list")
+    @GetMapping("/mdev/water/hour/summary")
+    @ApiOperation("查询水表计小时抄表统计")
+    public AjaxResult getMDevWaterConsumptionSummary(@ApiParam("查询参数") QueryMeter queryMeter) {
+        WaterConsumptionVO summary  = waterConsumptionService.selectMDevWaterConsumptionSummary(queryMeter);
+        return success(summary);
+    }
+
+    /**
+     * 导出区域用电统计数据
+     */
+    @RequiresPermissions("ems:consumption:export")
+    @Log(title = "区域用水统计", businessType = BusinessType.EXPORT)
+    @PostMapping("/mdev/water/hour/export")
+    @ApiOperation("导出区域用水统计数据")
+    public void exportMDevWaterList(HttpServletResponse response, @ApiParam("查询参数") QueryMeter queryMeter) {
+        List<WaterMeterH> list = waterConsumptionService.selectMDevWaterConsumptionList(queryMeter);
+        ExcelUtil<WaterMeterH> util = new ExcelUtil<>(WaterMeterH.class);
+        String fileName = String.format("水表抄表_%s_%s.xlsx", queryMeter.getTimeDimension(),
+            System.currentTimeMillis());
+        util.exportExcel(response, list, fileName);
+    }
+
     // ==================== 区域用水统计 ====================
 
     /**

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

@@ -71,7 +71,10 @@ public class MeterReadingController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody MeterReading nowItem) {
         try {
-            MeterReading lastItem = meterReadingService.selectLastItem(nowItem.getAreaCode(), nowItem.getDeviceCode());
+            MeterDevice meterDevice = meterDeviceService.selectMeterDeviceByCode(nowItem.getDeviceCode());
+            Assert.notNull(meterDevice, -1, "设备不存在");
+            nowItem.setAreaCode(meterDevice.getAreaCode());
+            MeterReading lastItem = meterReadingService.selectLastItem(meterDevice.getAreaCode(), nowItem.getDeviceCode());
             checkAdd(lastItem, nowItem);
             fillData(lastItem, nowItem);
             int count = meterReadingService.insert(nowItem);
@@ -90,12 +93,10 @@ public class MeterReadingController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody MeterReading nowItem) {
         try {
-            MeterReading lastItem = meterReadingService.selectLastItem(nowItem.getAreaCode(), nowItem.getDeviceCode());
-            checkMod(lastItem, nowItem);
-            meterReadingService.deleteById(nowItem.getId());
+            MeterReading lastItem = meterReadingService.selectById(nowItem.getId());
+            Assert.notNull(lastItem, -1, "记录不存在");
             nowItem.setMeterReading(nowItem.getMeterReading());
-            fillData(lastItem, nowItem);
-            int count = meterReadingService.insert(nowItem);
+            int count = meterReadingService.update(nowItem);
             return toAjax(count);
         }
         catch (BusinessException e) {
@@ -115,36 +116,22 @@ public class MeterReadingController extends BaseController {
 
     private void checkAdd(MeterReading lastItem, MeterReading nowItem) {
         if (null != lastItem) {
-            Date date = new Date();
-            String nowMonth = DateUtils.dateToString(date, "yyyyMM");
-            Assert.isTrue(!StringUtils.equals(nowMonth, lastItem.getMeterMonth()), -1, "本月已存在抄表记录");
-            Assert.isTrue(nowItem.getMeterReading() >= lastItem.getMeterReading(), -1, "抄表值不能小于上一条记录");
-        }
-    }
-
-    private void checkMod(MeterReading lastItem, MeterReading nowItem) {
-        if (null != lastItem) {
+            Assert.isTrue(!StringUtils.equals(nowItem.getMeterMonth(), lastItem.getMeterMonth()), -1, "本月已存在抄表记录");
             Assert.isTrue(nowItem.getMeterReading() >= lastItem.getMeterReading(), -1, "抄表值不能小于上一条记录");
         }
     }
 
     private void fillData(MeterReading lastItem, MeterReading meterRec) {
         MeterDevice meterDevice = meterDeviceService.selectMeterDeviceByCode(meterRec.getDeviceCode());
-        Date date = new Date();
 
         if (null != lastItem) {
-            meterRec.setYear(DateUtils.dateToString(date, "yyyy"));
-            meterRec.setMeterMonth(DateUtils.dateToString(date, "yyyyMM"));
+            meterRec.setYear(StringUtils.substring(lastItem.getYear(), 0, 4));
             meterRec.setLastReading(lastItem.getMeterReading());
             meterRec.setLastTime(lastItem.getMeterTime());
-            meterRec.setMeterTime(date);
             meterRec.setIncrease(
                 (meterRec.getMeterReading() - lastItem.getMeterReading()) * meterDevice.getMagnification());
         }
         else {
-            meterRec.setYear(DateUtils.dateToString(date, "yyyy"));
-            meterRec.setMeterMonth(DateUtils.dateToString(date, "yyyyMM"));
-            meterRec.setMeterTime(date);
             meterRec.setIncrease(meterRec.getMeterReading() * meterDevice.getMagnification());
         }
     }

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

@@ -46,41 +46,6 @@ public class WaterMeterHController extends BaseController {
     private IWaterMeterHService waterMeterHService;
 
     /**
-     * 查询用水计量-小时列表
-     */
-    @RequiresPermissions("ems:waterMeterH:list")
-    @GetMapping("/list")
-    public TableDataInfo list(QueryMeter queryMeter) {
-        startPage();
-        List<WaterMeterH> list = waterMeterHService.selectWaterMeterHList(queryMeter);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出用水计量-小时列表
-     */
-    @RequiresPermissions("ems:waterMeterH:export")
-    @Log(title = "用水计量-小时", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    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, "用水计量-小时数据");
-    }
-
-    /**
-     * 查询设施用能统计数据
-     *
-     * @param queryMeter 查询条件
-     * @return
-     */
-    @GetMapping("/staByTime")
-    public AjaxResult staByTime(QueryMeter queryMeter) {
-        EnergyMeter energyMeter = waterMeterHService.staByTime(queryMeter);
-        return success(energyMeter);
-    }
-
-    /**
      * 新增用水计量-小时
      */
     @RequiresPermissions("ems:waterMeterH:add")

ems/ems-core/src/main/java/com/ruoyi/ems/domain/ElecMeterH.java

@@ -46,7 +46,6 @@ public class ElecMeterH extends BaseEntity
     private Date time;
 
     /** 时间序列 */
-    @Excel(name = "时间序列")
     private Integer timeIndex;
 
     /** 用电量 单位：kW-h（千瓦时） */
@@ -67,6 +66,7 @@ public class ElecMeterH extends BaseEntity
     private Double useElecCost;
 
     /** 抄表读数 */
+    @Excel(name = "表计读数")
     private Double meterReading;
 
     public Long getId() {

ems/ems-core/src/main/java/com/ruoyi/ems/domain/WaterMeterH.java

@@ -38,7 +38,7 @@ public class WaterMeterH extends BaseEntity
 
     /** 日期 yyyy-MM-dd */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "日期 yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date date;
 
     /** 时间 HH:mm:ss */
@@ -47,7 +47,6 @@ public class WaterMeterH extends BaseEntity
     private Date time;
 
     /** 时间序列 */
-    @Excel(name = "时间序列")
     private Integer timeIndex;
 
     /** 用水量 单位：t（吨） */
@@ -63,6 +62,7 @@ public class WaterMeterH extends BaseEntity
     private Double useWaterCost;
 
     /** 抄表读数 */
+    @Excel(name = "表计读数")
     private Double meterReading;
 
     public Long getId() {

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

@@ -1,5 +1,6 @@
 package com.ruoyi.ems.mapper;
 
+import com.ruoyi.ems.domain.ElecMeterH;
 import com.ruoyi.ems.model.ElecConsumptionVO;
 import com.ruoyi.ems.model.QueryMeter;
 import org.apache.ibatis.annotations.Param;
@@ -14,37 +15,47 @@ public interface ElecConsumptionMapper {
     /**
      * 根据设备代码列表查询区域日用电统计
      */
-    List<String> selectElecHourSupportTypes(
-        @Param("queryMeter") QueryMeter queryMeter,
+    List<String> selectElecHourSupportTypes(@Param("queryMeter") QueryMeter queryMeter,
         @Param("meterDevices") Set<String> meterDevices);
+
+    // ==================== 电表计量统计方法 ====================
+
+    /**
+     * 计量设备抄表数据查询
+     */
+    List<ElecMeterH> selectMDevElecConsumptionList(QueryMeter queryMeter);
+
+    /**
+     * 计量设备抄表数据统计
+     * @param queryMeter 查询条件
+     * @return 统计电量信息
+     */
+    ElecConsumptionVO selectMDevElecConsumptionSummary(QueryMeter queryMeter);
+
     // ==================== 区域用电统计方法 ====================
 
     /**
      * 根据设备代码列表查询区域日用电统计
      */
-    List<ElecConsumptionVO> selectAreaDailyElecConsumptionByDevices(
-        @Param("queryMeter") QueryMeter queryMeter,
+    List<ElecConsumptionVO> selectAreaDailyElecConsumptionByDevices(@Param("queryMeter") QueryMeter queryMeter,
         @Param("meterDevices") Set<String> meterDevices);
 
     /**
      * 根据设备代码列表查询区域月用电统计
      */
-    List<ElecConsumptionVO> selectAreaMonthlyElecConsumptionByDevices(
-        @Param("queryMeter") QueryMeter queryMeter,
+    List<ElecConsumptionVO> selectAreaMonthlyElecConsumptionByDevices(@Param("queryMeter") QueryMeter queryMeter,
         @Param("meterDevices") Set<String> meterDevices);
 
     /**
      * 根据设备代码列表查询区域年用电统计
      */
-    List<ElecConsumptionVO> selectAreaYearlyElecConsumptionByDevices(
-        @Param("queryMeter") QueryMeter queryMeter,
+    List<ElecConsumptionVO> selectAreaYearlyElecConsumptionByDevices(@Param("queryMeter") QueryMeter queryMeter,
         @Param("meterDevices") Set<String> meterDevices);
 
     /**
      * 根据设备代码列表查询区域用电汇总
      */
-    ElecConsumptionVO selectAreaElecConsumptionSummaryByDevices(
-        @Param("queryMeter") QueryMeter queryMeter,
+    ElecConsumptionVO selectAreaElecConsumptionSummaryByDevices(@Param("queryMeter") QueryMeter queryMeter,
         @Param("meterDevices") Set<String> meterDevices);
 
     // ==================== 设施用电统计方法 ====================

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

@@ -15,13 +15,6 @@ import java.util.List;
  * @date 2024-12-03
  */
 public interface ElecMeterHMapper {
-    /**
-     * 查询用电计量-小时列表
-     *
-     * @param queryMeter 查询计量条件
-     * @return 用电计量-小时集合
-     */
-    List<ElecMeterH> selectElecMeterByDev(QueryMeter queryMeter);
 
     /**
      * 查询用电计量-小时列表
@@ -64,14 +57,6 @@ public interface ElecMeterHMapper {
     EnergyMeter selectElecDayAvg(QueryMeter queryMeter);
 
     /**
-     * 根据时间统计
-     *
-     * @param queryMeter 查询条件
-     * @return 统计
-     */
-    List<EnergyMeter> selectStaByTime(QueryMeter queryMeter);
-
-    /**
      * 新增用电计量-小时
      *
      * @param elecMeterH 用电计量-小时

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

@@ -10,6 +10,7 @@
  */
 package com.ruoyi.ems.mapper;
 
+import com.ruoyi.ems.domain.WaterMeterH;
 import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.model.WaterConsumptionVO;
 import org.apache.ibatis.annotations.Param;
@@ -21,6 +22,20 @@ import java.util.Set;
  * 用水统计Mapper接口
  */
 public interface WaterConsumptionMapper {
+    // ==================== 水表计量统计方法 ====================
+
+    /**
+     * 计量设备抄表数据查询
+     */
+    List<WaterMeterH> selectMDevWaterConsumptionList(QueryMeter queryMeter);
+
+    /**
+     * 计量设备抄表数据统计
+     * @param queryMeter 查询条件
+     * @return 统计电量信息
+     */
+    WaterConsumptionVO selectMDevWaterConsumptionSummary(QueryMeter queryMeter);
+
 
     // ==================== 区域用水统计方法 ====================
 

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

@@ -15,16 +15,6 @@ import java.util.List;
  */
 public interface WaterMeterHMapper {
     /**
-     * 查询用水计量-小时列表
-     *
-     * @param queryMeter 用水计量-小时
-     * @return 用水计量-小时集合
-     */
-    List<WaterMeterH> selectWaterMeterHList(QueryMeter queryMeter);
-
-    EnergyMeter staByTime(QueryMeter queryMeter);
-
-    /**
      * 批量插入用水计量-小时数据
      * @param list 待插入的用水计量-小时数据列表
      * @return 插入的记录数

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

@@ -1,5 +1,6 @@
 package com.ruoyi.ems.service;
 
+import com.ruoyi.ems.domain.ElecMeterH;
 import com.ruoyi.ems.model.ElecConsumptionExportVO;
 import com.ruoyi.ems.model.ElecConsumptionVO;
 import com.ruoyi.ems.model.QueryMeter;
@@ -13,6 +14,11 @@ public interface IElecConsumptionService {
     List<String> getElecHourTypes(QueryMeter queryMeter);
 
     /**
+     * 查询电表原始计量数据
+     */
+    List<ElecMeterH> selectMDevElecConsumptionList(QueryMeter queryMeter);
+
+    /**
      * 查询区域用电统计列表
      */
     List<ElecConsumptionVO> selectAreaElecConsumptionList(QueryMeter queryMeter);
@@ -23,6 +29,11 @@ public interface IElecConsumptionService {
     List<ElecConsumptionVO> selectFacsElecConsumptionList(QueryMeter queryMeter);
 
     /**
+     * 查询表计抄表数据汇总
+     */
+    ElecConsumptionVO selectMDevElecConsumptionSummary(QueryMeter queryMeter);
+
+    /**
      * 查询区域用电统计汇总
      */
     ElecConsumptionVO selectAreaElecConsumptionSummary(QueryMeter queryMeter);

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

@@ -14,14 +14,6 @@ import java.util.List;
  */
 public interface IElecMeterHService {
     /**
-     * 查询用电计量-小时列表
-     *
-     * @param queryMeter 用电计量-小时
-     * @return 用电计量-小时集合
-     */
-    List<ElecMeterH> selectByMeterDev(QueryMeter queryMeter);
-
-    /**
      * 统计用电计量-根据边界对象
      *
      * @param queryMeter 查询条件
@@ -37,14 +29,6 @@ public interface IElecMeterHService {
     List<ElecMeterH> staMeterDayList(QueryMeter queryMeter);
 
     /**
-     * 统计用电计量-根据时间
-     *
-     * @param queryMeter 查询条件
-     * @return 用电统计
-     */
-    List<EnergyMeter> staByTime(QueryMeter queryMeter);
-
-    /**
      * 统计用电计量-根据边界对象
      *
      * @param queryMeter 查询条件

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

@@ -10,6 +10,7 @@
  */
 package com.ruoyi.ems.service;
 
+import com.ruoyi.ems.domain.WaterMeterH;
 import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.model.WaterConsumptionExportVO;
 import com.ruoyi.ems.model.WaterConsumptionVO;
@@ -22,6 +23,11 @@ import java.util.List;
 public interface IWaterConsumptionService {
 
     /**
+     * 查询水表原始计量数据
+     */
+    List<WaterMeterH> selectMDevWaterConsumptionList(QueryMeter queryMeter);
+
+    /**
      * 查询区域用水统计列表
      */
     List<WaterConsumptionVO> selectAreaWaterConsumptionList(QueryMeter queryMeter);
@@ -32,6 +38,11 @@ public interface IWaterConsumptionService {
     List<WaterConsumptionVO> selectFacsWaterConsumptionList(QueryMeter queryMeter);
 
     /**
+     * 查询表计抄表数据汇总
+     */
+    WaterConsumptionVO selectMDevWaterConsumptionSummary(QueryMeter queryMeter);
+
+    /**
      * 查询区域用水统计汇总
      */
     WaterConsumptionVO selectAreaWaterConsumptionSummary(QueryMeter queryMeter);
@@ -54,5 +65,6 @@ public interface IWaterConsumptionService {
     /**
      * 转换为用水导出VO列表
      */
-    List<WaterConsumptionExportVO> convertToWaterExportVOList(List<WaterConsumptionVO> originalList, String timeDimension);
+    List<WaterConsumptionExportVO> convertToWaterExportVOList(List<WaterConsumptionVO> originalList,
+        String timeDimension);
 }

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

@@ -13,17 +13,6 @@ import java.util.List;
  * @date 2024-12-03
  */
 public interface IWaterMeterHService {
-
-    /**
-     * 查询用水计量-小时列表
-     *
-     * @param queryMeter 用水计量-小时
-     * @return 用水计量-小时集合
-     */
-    List<WaterMeterH> selectWaterMeterHList(QueryMeter queryMeter);
-
-    EnergyMeter staByTime(QueryMeter queryMeter);
-
     /**
      * 新增用电计量-小时
      *

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

@@ -1,6 +1,7 @@
 package com.ruoyi.ems.service.impl;
 
 import com.ruoyi.ems.domain.Area;
+import com.ruoyi.ems.domain.ElecMeterH;
 import com.ruoyi.ems.mapper.ElecConsumptionMapper;
 import com.ruoyi.ems.model.ElecConsumptionExportVO;
 import com.ruoyi.ems.model.ElecConsumptionVO;
@@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -70,6 +72,17 @@ public class ElecConsumptionServiceImpl implements IElecConsumptionService {
         }
     }
 
+    /**
+     * 查询用电计量-小时列表
+     *
+     * @param queryMeter 用电计量-小时
+     * @return 用电计量-小时集合
+     */
+    @Override
+    public List<ElecMeterH> selectMDevElecConsumptionList(QueryMeter queryMeter) {
+        return elecConsumptionMapper.selectMDevElecConsumptionList(queryMeter);
+    }
+
     @Override
     public List<ElecConsumptionVO> selectAreaElecConsumptionList(QueryMeter queryMeter) {
         if (queryMeter == null) {
@@ -299,6 +312,11 @@ public class ElecConsumptionServiceImpl implements IElecConsumptionService {
     }
 
     @Override
+    public ElecConsumptionVO selectMDevElecConsumptionSummary(QueryMeter queryMeter) {
+        return elecConsumptionMapper.selectMDevElecConsumptionSummary(queryMeter);
+    }
+
+    @Override
     public ElecConsumptionVO selectFacsElecConsumptionSummary(QueryMeter queryMeter) {
         if (queryMeter == null) {
             logger.warn("查询参数为空，返回空对象");

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

@@ -23,17 +23,6 @@ public class ElecMeterHServiceImpl implements IElecMeterHService {
     private ElecMeterHMapper elecMeterHMapper;
 
     /**
-     * 根据电表/断路器查询用电计量-小时列表
-     *
-     * @param queryMeter 用电计量-小时
-     * @return 用电计量-小时
-     */
-    @Override
-    public List<ElecMeterH> selectByMeterDev(QueryMeter queryMeter) {
-        return elecMeterHMapper.selectElecMeterByDev(queryMeter);
-    }
-
-    /**
      * 根据多个电表/断路器合并查询用电计量-小时列表
      *
      * @param queryMeter 用电计量-小时
@@ -49,11 +38,6 @@ public class ElecMeterHServiceImpl implements IElecMeterHService {
         return elecMeterHMapper.selectElecMeterDayList(queryMeter);
     }
 
-    @Override
-    public List<EnergyMeter> staByTime(QueryMeter queryMeter) {
-        return elecMeterHMapper.selectStaByTime(queryMeter);
-    }
-
     /**
      * 统计用电计量-根据边界对象
      *

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

@@ -1,6 +1,7 @@
 package com.ruoyi.ems.service.impl;
 
 import com.ruoyi.ems.domain.Area;
+import com.ruoyi.ems.domain.WaterMeterH;
 import com.ruoyi.ems.mapper.WaterConsumptionMapper;
 import com.ruoyi.ems.model.QueryMeter;
 import com.ruoyi.ems.model.WaterConsumptionExportVO;
@@ -46,6 +47,11 @@ public class WaterConsumptionServiceImpl implements IWaterConsumptionService {
     private static final int WATER_METER_CLS = 70;
 
     @Override
+    public List<WaterMeterH> selectMDevWaterConsumptionList(QueryMeter queryMeter) {
+        return waterConsumptionMapper.selectMDevWaterConsumptionList(queryMeter);
+    }
+
+    @Override
     public List<WaterConsumptionVO> selectAreaWaterConsumptionList(QueryMeter queryMeter) {
         if (queryMeter == null) {
             return Collections.emptyList();
@@ -233,6 +239,11 @@ public class WaterConsumptionServiceImpl implements IWaterConsumptionService {
     }
 
     @Override
+    public WaterConsumptionVO selectMDevWaterConsumptionSummary(QueryMeter queryMeter) {
+        return waterConsumptionMapper.selectMDevWaterConsumptionSummary(queryMeter);
+    }
+
+    @Override
     public WaterConsumptionVO selectFacsWaterConsumptionSummary(QueryMeter queryMeter) {
         if (queryMeter == null) {
             return new WaterConsumptionVO();

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

@@ -22,22 +22,6 @@ public class WaterMeterHServiceImpl implements IWaterMeterHService {
     @Autowired
     private WaterMeterHMapper waterMeterHMapper;
 
-    /**
-     * 查询用水计量-小时列表
-     *
-     * @param queryMeter 用水计量-小时
-     * @return 用水计量-小时
-     */
-    @Override
-    public List<WaterMeterH> selectWaterMeterHList(QueryMeter queryMeter) {
-        return waterMeterHMapper.selectWaterMeterHList(queryMeter);
-    }
-
-    @Override
-    public EnergyMeter staByTime(QueryMeter queryMeter) {
-        return waterMeterHMapper.staByTime(queryMeter);
-    }
-
     @Override
     public int insertBatch(List<WaterMeterH> list) {
         return waterMeterHMapper.insertBatch(list);

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

@@ -24,7 +24,24 @@
         <result property="createTime" column="create_time"/>
     </resultMap>
 
-    <!-- ==================== 区域用电统计查询（基于设备codes汇总，支持峰谷电） ==================== -->
+    <resultMap type="com.ruoyi.ems.domain.ElecMeterH" id="ElecMeterHResult">
+        <result property="id" column="id"/>
+        <result property="areaCode" column="area_code"/>
+        <result property="deviceCode" column="device_code"/>
+        <result property="deviceName" column="device_name"/>
+        <result property="recordTime" column="record_time"/>
+        <result property="date" column="date"/>
+        <result property="time" column="time"/>
+        <result property="timeIndex" column="time_index"/>
+        <result property="elecQuantity" column="elec_quantity"/>
+        <result property="meterType" column="meter_type"/>
+        <result property="meterUnitPrice" column="meter_unit_price"/>
+        <result property="useElecCost" column="use_elec_cost"/>
+        <result property="meterReading" column="meter_reading"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+    <!-- ==================== 查询分时类型 ==================== -->
     <select id="selectElecHourSupportTypes" resultType="java.lang.String">
         SELECT
         DISTINCT h.meter_type
@@ -45,6 +62,50 @@
         ORDER BY h.meter_type DESC
     </select>
 
+    <!-- ==================== 电表抄表数据查询 ==================== -->
+    <select id="selectMDevElecConsumptionList" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="ElecMeterHResult">
+        select
+        m.id, m.area_code, m.device_code, d.device_name, m.record_time, m.`date`, m.`time`, m.time_index,
+        m.elec_quantity, m.meter_type, m.meter_unit_price, m.use_elec_cost, m.meter_reading, m.create_time
+        from adm_elec_meter_h m
+        left join adm_meter_device d on m.device_code = d.device_code
+        <where>
+            <if test="areaCode != null  and areaCode != ''">and m.area_code = #{areaCode}</if>
+            <if test="deviceCode != null  and deviceCode != ''">and m.device_code = #{deviceCode}</if>
+            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime != ''">
+                and m.record_time between #{startRecTime} and #{endRecTime}
+            </if>
+        </where>
+        order by m.record_time ${orderFlag}
+    </select>
+
+    <select id="selectMDevElecConsumptionSummary" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="ElecConsumptionResult">
+        SELECT
+         h.area_code,
+         d.device_name as obj_name,
+         d.device_code as obj_code,
+        ROUND(SUM(COALESCE(h.elec_quantity, 0)), 2) as total_elec_quantity,
+        ROUND(SUM(CASE WHEN h.meter_type = 2 THEN COALESCE(h.elec_quantity, 0) ELSE 0 END), 2) as sharp_peak_quantity,
+        ROUND(SUM(CASE WHEN h.meter_type = 1 THEN COALESCE(h.elec_quantity, 0) ELSE 0 END), 2) as peak_quantity,
+        ROUND(SUM(CASE WHEN h.meter_type = 0 THEN COALESCE(h.elec_quantity, 0) ELSE 0 END), 2) as normal_quantity,
+        ROUND(SUM(CASE WHEN h.meter_type = -1 THEN COALESCE(h.elec_quantity, 0) ELSE 0 END), 2) as valley_quantity,
+        ROUND(SUM(CASE WHEN h.meter_type = -2 THEN COALESCE(h.elec_quantity, 0) ELSE 0 END), 2) as deep_valley_quantity,
+        ROUND(SUM(COALESCE(h.use_elec_cost, 0)), 2) as total_elec_cost
+        FROM adm_elec_meter_h h
+            LEFT JOIN adm_meter_device d ON h.device_code = d.device_code
+        <where>
+            <if test="deviceCode != null  and deviceCode != ''">and h.device_code = #{deviceCode}</if>
+            <if test="startRecTime != null and startRecTime != ''">
+                AND h.record_time &gt;= #{startRecTime}
+            </if>
+            <if test="endRecTime != null and endRecTime != ''">
+                AND h.record_time &lt;= #{endRecTime}
+            </if>
+        </where>
+    </select>
+
+    <!-- ==================== 区域用电统计查询 ==================== -->
+
     <!-- 根据设备代码列表查询区域日用电统计 -->
     <select id="selectAreaDailyElecConsumptionByDevices" resultMap="ElecConsumptionResult">
         SELECT

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

@@ -47,22 +47,6 @@
         from adm_elec_meter_h
     </sql>
 
-    <select id="selectElecMeterByDev" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="ElecMeterHResult">
-        select
-        m.id, m.area_code, m.device_code, d.device_name, m.record_time, m.`date`, m.`time`, m.time_index,
-        m.elec_quantity, m.meter_type, m.meter_unit_price, m.use_elec_cost, m.create_time
-        from adm_elec_meter_h m
-        left join adm_meter_device d on m.device_code = d.device_code
-        <where>
-            <if test="areaCode != null  and areaCode != ''">and m.area_code = #{areaCode}</if>
-            <if test="deviceCode != null  and deviceCode != ''">and m.device_code = #{deviceCode}</if>
-            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime != ''">and
-                m.record_time between #{startRecTime} and #{endRecTime}
-            </if>
-        </where>
-        order by m.record_time ${orderFlag}
-    </select>
-
     <select id="selectElecMeterByDevs" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="ElecMeterHResult">
         select
         '${objCode}' as device_code,
@@ -166,31 +150,6 @@
         </where>
     </select>
 
-    <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
-        FROM
-        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 != ''">
-                and record_time between #{startRecTime} and #{endRecTime}
-            </if>
-            <if test="areaCode != null and areaCode != '0'">
-                and area_code = #{areaCode}
-            </if>
-        </where>
-        GROUP BY meter_type
-    </select>
-
     <insert id="insertElecMeterH" parameterType="com.ruoyi.ems.domain.ElecMeterH" useGeneratedKeys="true"
             keyProperty="id">
         insert into adm_elec_meter_h

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

@@ -19,6 +19,63 @@
         <result property="createTime" column="create_time"/>
     </resultMap>
 
+    <resultMap type="com.ruoyi.ems.domain.WaterMeterH" id="WaterMeterHResult">
+        <result property="id"    column="id"    />
+        <result property="areaCode"    column="area_code"    />
+        <result property="deviceCode"    column="device_code"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="recordTime"    column="record_time"    />
+        <result property="date"    column="date"    />
+        <result property="time"    column="time"    />
+        <result property="timeIndex"    column="time_index"    />
+        <result property="waterQuantity"    column="water_quantity"    />
+        <result property="meterUnitPrice"    column="meter_unit_price"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="useWaterCost"    column="use_water_cost"    />
+        <result property="meterReading" column="meter_reading"/>
+    </resultMap>
+
+    <!-- ==================== 水表抄表数据查询 ==================== -->
+    <select id="selectMDevWaterConsumptionList" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="WaterMeterHResult">
+        select
+        m.id, m.area_code, m.device_code, d.device_name, m.record_time, m.`date`, m.`time`, m.time_index, m.water_quantity, m.meter_unit_price, m.use_water_cost, m.meter_reading, m.create_time
+        from adm_water_meter_h m
+        left join adm_meter_device d on m.device_code = d.device_code
+        <where>
+            <if test="areaCode != null  and areaCode != ''">
+                and m.area_code = #{areaCode}
+            </if>
+            <if test="deviceCode != null  and deviceCode != ''">
+                and m.device_code = #{deviceCode}
+            </if>
+            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime != ''">
+                and m.record_time between #{startRecTime} and #{endRecTime}
+            </if>
+        </where>
+        order by m.record_time ${orderFlag}
+    </select>
+
+    <select id="selectMDevWaterConsumptionSummary" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="WaterConsumptionResult">
+        SELECT
+        h.area_code,
+        d.device_name as obj_name,
+        d.device_code as obj_code,
+        ROUND(SUM(COALESCE(h.water_quantity, 0)), 2) as total_water_quantity,
+        ROUND(SUM(COALESCE(h.use_water_cost, 0)), 2) as total_water_cost
+        FROM adm_water_meter_h h
+        LEFT JOIN adm_meter_device d ON h.device_code = d.device_code
+        <where>
+            <if test="deviceCode != null  and deviceCode != ''">and h.device_code = #{deviceCode}</if>
+            <if test="startRecTime != null and startRecTime != ''">
+                AND h.record_time &gt;= #{startRecTime}
+            </if>
+            <if test="endRecTime != null and endRecTime != ''">
+                AND h.record_time &lt;= #{endRecTime}
+            </if>
+        </where>
+    </select>
+
+
     <!-- ==================== 区域用水统计查询（基于设备codes汇总） ==================== -->
 
     <!-- 根据设备代码列表查询区域日用水统计 -->

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

@@ -33,31 +33,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, area_code, device_code, record_time, `date`, `time`, time_index, water_quantity, meter_unit_price, use_water_cost, meter_reading, create_time from adm_water_meter_h
     </sql>
 
-    <select id="selectWaterMeterHList" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="WaterMeterHResult">
-        select
-            m.id, m.area_code, m.device_code, d.device_name, m.record_time, m.`date`, m.`time`, m.time_index, m.water_quantity, m.meter_unit_price, m.use_water_cost, m.meter_reading, m.create_time
-        from adm_water_meter_h m
-          left join adm_meter_device d on m.device_code = d.device_code
-        <where>  
-            <if test="areaCode != null  and areaCode != ''"> and m.area_code = #{areaCode}</if>
-            <if test="deviceCode != null  and deviceCode != ''"> and m.device_code = #{deviceCode}</if>
-            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime != ''"> and m.record_time between #{startRecTime} and #{endRecTime}</if>
-        </where>
-    </select>
-
-    <select id="staByTime" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="WaterMeterResult">
-        select area_code, device_code as obj_code, ROUND(SUM(water_quantity),2) AS water_quantity, ROUND(SUM(use_water_cost),3) AS use_water_cost from adm_water_meter_h h
-        <where>
-            <if test="deviceCode != null  and deviceCode != ''">and device_code = #{deviceCode}</if>
-            <if test="startRecTime != null and startRecTime != '' and endRecTime != null and endRecTime != ''">
-                and record_time between #{startRecTime} and #{endRecTime}
-            </if>
-            <if test="areaCode != null and areaCode != '0'">
-                and area_code = #{areaCode}
-            </if>
-        </where>
-    </select>
-
     <select id="getElecMeterHByObj" parameterType="com.ruoyi.ems.model.QueryMeter" resultMap="WaterMeterHResult">
         select
           m.id,

ems/sql/ems_init_data.sql

@@ -576,6 +576,13 @@ INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_model`, `dev
 
 -- 测试表
 INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_model`, `device_name`, `location_ref`, `location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', '864142073640059', 'M_W2_QF_GEEKOPEN', '智能断路器', '321283124S300101', '综合楼C3-茶水间', 45, 0, 3600, 0, 1, '智能表');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_model`, `device_name`, `location_ref`, `location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-E-B-101', 'test', '综合楼B-101', '321283124S300101', '一楼设备间', 45, 1, NULL, 1, 1, '智能表');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_model`, `device_name`, `location_ref`, `location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3001', 'J-W-B-102', 'test', '综合楼B-102', '321283124S300101', '一楼设备间', 70, 1, NULL, 1, 1, '智能表');
+
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_model`, `device_name`, `location_ref`, `location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-E-N-101', 'test', '综合楼N-101', '321283124S300201', '一楼设备间', 45, 1, NULL, 1, 1, '智能表');
+INSERT INTO `adm_meter_device` (`area_code`, `device_code`, `device_model`, `device_name`, `location_ref`, `location`, `meter_cls`, `obj_tag`, `col_cycle`, `col_mode`, `magnification`, `spec_desc`) VALUES ('321283124S3002', 'J-W-N-102', 'test', '综合楼N-103', '321283124S300201', '一楼设备间', 70, 1, NULL, 1, 1, '智能表');
+
+
 
 -- 北区区域-表计测点绑定关系
 INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `meter_device`) VALUES (1, '321283124S300101', 45, 'C_2003_AV_0000');
@@ -854,256 +861,48 @@ INSERT INTO `adm_meter_boundary_rel` (`obj_type`, `boundary_obj`, `meter_cls`, `
 
 
 -- 抄表demo数据
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202402', 100, '2024-01-31', 238, '2024-02-28', 138, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202403', 238, '2024-02-28', 365, '2024-03-31', 127, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202404', 365, '2024-03-31', 537, '2024-04-30', 172, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202405', 537, '2024-04-30', 686, '2024-05-31', 149, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202406', 686, '2024-05-31', 921, '2024-06-30', 235, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202407', 921, '2024-06-30', 1189, '2024-07-31', 268, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202408', 1189, '2024-07-31', 1464, '2024-08-31', 275, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202409', 1464, '2024-08-31', 1797, '2024-09-30', 333, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202410', 1797, '2024-09-30', 2045, '2024-10-31', 248, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202411', 2045, '2024-10-31', 2345, '2024-11-30', 300, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2024', '202412', 2345, '2024-11-30', 2570, '2024-12-31', 225, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2025', '202501', 2570, '2024-12-31', 2815, '2025-01-31', 245, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2025', '202502', 2815, '2025-01-31', 3123, '2025-02-28', 308, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2025', '202503', 3123, '2025-02-28', 3441, '2025-03-31', 318, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2025', '202504', 3441, '2025-03-31', 3853, '2025-04-30', 412, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2025', '202505', 3853, '2025-04-30', 4211, '2025-05-31', 358, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2025', '202506', 4211, '2025-05-31', 4605, '2025-06-30', 394, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-101', '321283124S3001', '2025', '202507', 4605, '2025-06-30', 5016, '2025-07-31', 411, NULL, NULL);
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202402', 100, '2024-01-31', 238, '2024-02-28', 138, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202403', 238, '2024-02-28', 365, '2024-03-31', 127, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202404', 365, '2024-03-31', 537, '2024-04-30', 172, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202405', 537, '2024-04-30', 686, '2024-05-31', 149, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202406', 686, '2024-05-31', 921, '2024-06-30', 235, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202407', 921, '2024-06-30', 1189, '2024-07-31', 268, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202408', 1189, '2024-07-31', 1464, '2024-08-31', 275, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202409', 1464, '2024-08-31', 1797, '2024-09-30', 333, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202410', 1797, '2024-09-30', 2045, '2024-10-31', 248, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202411', 2045, '2024-10-31', 2345, '2024-11-30', 300, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2024', '202412', 2345, '2024-11-30', 2620, '2024-12-31', 275, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2025', '202501', 2620, '2024-12-31', 2877, '2025-01-31', 257, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2025', '202502', 2877, '2025-01-31', 3111, '2025-02-28', 234, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2025', '202503', 3111, '2025-02-28', 3254, '2025-03-31', 143, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2025', '202504', 3254, '2025-03-31', 3452, '2025-04-30', 198, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2025', '202505', 3452, '2025-04-30', 3666, '2025-05-31', 214, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2025', '202506', 3666, '2025-05-31', 3915, '2025-06-30', 249, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-102', '321283124S3001', '2025', '202507', 3915, '2025-06-30', 4182, '2025-07-31', 267, NULL, NULL);
-
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202402', 100, '2024-01-31', 250, '2024-02-28', 150, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202403', 250, '2024-02-28', 360, '2024-03-31', 160, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202404', 360, '2024-03-31', 500, '2024-04-30', 140, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202405', 500, '2024-04-30', 600, '2024-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202406', 600, '2024-05-31', 720, '2024-06-30', 120, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202407', 720, '2024-06-30', 800, '2024-07-31', 80, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202408', 800, '2024-07-31', 860, '2024-08-31', 160, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202409', 860, '2024-08-31', 1030, '2024-09-30', 170, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202410', 1030, '2024-09-30', 1213, '2024-10-31', 183, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202411', 1213, '2024-10-31', 1413, '2024-11-30', 200, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2024', '202412', 1413, '2024-11-30', 1690, '2024-12-31', 277, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2025', '202501', 1690, '2024-12-31', 1928, '2025-01-31', 238, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2025', '202502', 1928, '2025-01-31', 2247, '2025-02-28', 319, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2025', '202503', 2247, '2025-02-28', 2630, '2025-03-31', 383, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2025', '202504', 2630, '2025-03-31', 2971, '2025-04-30', 341, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2025', '202505', 2971, '2025-04-30', 3354, '2025-05-31', 383, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2025', '202506', 3354, '2025-05-31', 3728, '2025-06-30', 374, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-103', '321283124S3001', '2025', '202507', 3728, '2025-06-30', 4118, '2025-07-31', 390, NULL, NULL);
-
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202402', 100, '2024-01-31', 200, '2024-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202403', 200, '2024-02-28', 300, '2024-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202404', 300, '2024-03-31', 400, '2024-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202405', 400, '2024-04-30', 500, '2024-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202406', 500, '2024-05-31', 600, '2024-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202407', 600, '2024-06-30', 700, '2024-07-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202408', 700, '2024-07-31', 800, '2024-08-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202409', 800, '2024-08-31', 900, '2024-09-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202410', 900, '2024-09-30', 1000, '2024-10-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202411', 1000, '2024-10-31', 1100, '2024-11-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2024', '202412', 1100, '2024-11-30', 1200, '2024-12-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2025', '202501', 1200, '2024-11-30', 1300, '2025-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2025', '202502', 1300, '2025-01-31', 1400, '2025-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2025', '202503', 1400, '2025-02-28', 1500, '2025-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2025', '202504', 1500, '2025-03-31', 1600, '2025-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2025', '202505', 1600, '2025-04-30', 1700, '2025-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2025', '202506', 1700, '2025-05-31', 1800, '2025-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-104', '321283124S3001', '2025', '202507', 1800, '2025-06-30', 1900, '2025-07-31', 100, NULL, NULL);
-
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202402', 100, '2024-01-31', 200, '2024-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202403', 200, '2024-02-28', 300, '2024-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202404', 300, '2024-03-31', 400, '2024-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202405', 400, '2024-04-30', 500, '2024-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202406', 500, '2024-05-31', 600, '2024-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202407', 600, '2024-06-30', 700, '2024-07-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202408', 700, '2024-07-31', 800, '2024-08-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202409', 800, '2024-08-31', 900, '2024-09-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202410', 900, '2024-09-30', 1000, '2024-10-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202411', 1000, '2024-10-31', 1100, '2024-11-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2024', '202412', 1100, '2024-11-30', 1200, '2024-12-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2025', '202501', 1200, '2024-12-31', 1300, '2025-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2025', '202502', 1300, '2025-01-31', 1400, '2025-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2025', '202503', 1400, '2025-02-28', 1500, '2025-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2025', '202504', 1500, '2025-03-31', 1600, '2025-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2025', '202505', 1600, '2025-04-30', 1700, '2025-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2025', '202506', 1700, '2025-05-31', 1800, '2025-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-105', '321283124S3001', '2025', '202507', 1800, '2025-06-30', 1900, '2025-07-31', 100, NULL, NULL);
-
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202402', 100, '2024-01-31', 200, '2024-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202403', 200, '2024-02-28', 300, '2024-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202404', 300, '2024-03-31', 400, '2024-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202405', 400, '2024-04-30', 500, '2024-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202406', 500, '2024-05-31', 600, '2024-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202407', 600, '2024-06-30', 700, '2024-07-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202408', 700, '2024-07-31', 800, '2024-08-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202409', 800, '2024-08-31', 900, '2024-09-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202410', 900, '2024-09-30', 1000, '2024-10-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202411', 1000, '2024-10-31', 1100, '2024-11-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2024', '202412', 1100, '2024-11-30', 1200, '2024-12-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2025', '202501', 1200, '2024-12-31', 1300, '2025-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2025', '202502', 1300, '2025-01-31', 1400, '2025-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2025', '202503', 1400, '2025-02-28', 1500, '2025-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2025', '202504', 1500, '2025-02-28', 1600, '2025-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2025', '202505', 1600, '2025-04-30', 1700, '2025-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2025', '202506', 1700, '2025-05-31', 1800, '2025-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-106', '321283124S3001', '2025', '202507', 1800, '2025-06-30', 1900, '2025-07-31', 100, NULL, NULL);
-
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202402', 100, '2024-01-31', 200, '2024-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202403', 200, '2024-02-28', 300, '2024-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202404', 300, '2024-03-31', 400, '2024-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202405', 400, '2024-04-30', 500, '2024-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202406', 500, '2024-05-31', 600, '2024-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202407', 600, '2024-06-30', 700, '2024-07-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202408', 700, '2024-07-31', 800, '2024-08-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202409', 800, '2024-08-31', 900, '2024-09-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202410', 900, '2024-09-30', 1000, '2024-10-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202411', 1000, '2024-10-31', 1100, '2024-11-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2024', '202412', 1100, '2024-11-30', 1200, '2024-12-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2025', '202501', 1200, '2024-12-31', 1300, '2025-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2025', '202502', 1300, '2025-01-31', 1400, '2025-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2025', '202503', 1400, '2025-02-28', 1500, '2025-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2025', '202504', 1500, '2025-03-31', 1600, '2025-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2025', '202505', 1600, '2025-04-30', 1700, '2025-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2025', '202506', 1700, '2025-05-31', 1800, '2025-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-107', '321283124S3001', '2025', '202507', 1800, '2025-06-30', 1900, '2025-07-31', 100, NULL, NULL);
-
-
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202402', 100, '2024-01-31', 200, '2024-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202403', 200, '2024-02-28', 300, '2024-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202404', 300, '2024-03-31', 400, '2024-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202405', 400, '2024-04-30', 500, '2024-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202406', 500, '2024-05-31', 600, '2024-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202407', 600, '2024-06-30', 700, '2024-07-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202408', 700, '2024-07-31', 800, '2024-08-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202409', 700, '2024-08-31', 900, '2024-09-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202410', 900, '2024-09-30', 1000, '2024-10-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202411', 1000, '2024-10-31', 1100, '2024-11-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2024', '202412', 1100, '2024-11-30', 1200, '2024-12-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2025', '202501', 1200, '2024-12-31', 1300, '2025-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2025', '202502', 1300, '2025-01-31', 1400, '2025-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2025', '202503', 1400, '2025-02-28', 1500, '2025-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2025', '202504', 1500, '2025-03-31', 1600, '2025-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2025', '202505', 1600, '2025-04-30', 1700, '2025-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2025', '202506', 1700, '2025-05-31', 1800, '2025-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-108', '321283124S3001', '2025', '202507', 1800, '2025-06-30', 1900, '2025-07-31', 100, NULL, NULL);
-
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202402', 100, '2024-01-31', 200, '2024-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202403', 200, '2024-02-28', 300, '2024-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202404', 300, '2024-03-31', 400, '2024-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202405', 400, '2024-04-30', 500, '2024-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202406', 500, '2024-05-31', 600, '2024-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202407', 600, '2024-06-30', 700, '2024-07-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202408', 700, '2024-07-31', 800, '2024-08-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202409', 800, '2024-08-31', 900, '2024-09-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202410', 900, '2024-09-30', 1000, '2024-10-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202411', 1000, '2024-10-31', 1100, '2024-11-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2024', '202412', 1100, '2024-11-30', 1200, '2024-12-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2025', '202501', 1200, '2024-12-31', 1300, '2025-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2025', '202502', 1300, '2025-01-31', 1400, '2025-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2025', '202503', 1400, '2025-02-28', 1500, '2025-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2025', '202504', 1500, '2025-03-31', 1600, '2025-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2025', '202505', 1600, '2025-04-30', 1700, '2025-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2025', '202506', 1700, '2025-05-31', 1800, '2025-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-109', '321283124S3001', '2025', '202507', 1800, '2025-06-30', 1900, '2025-07-31', 100, NULL, NULL);
-
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202402', 100, '2024-01-31', 200, '2024-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202403', 200, '2024-02-28', 300, '2024-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202404', 300, '2024-03-31', 400, '2024-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202405', 400, '2024-04-30', 500, '2024-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202406', 500, '2024-05-31', 600, '2024-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202407', 600, '2024-06-30', 700, '2024-07-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202408', 700, '2024-07-31', 800, '2024-08-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202409', 800, '2024-08-31', 900, '2024-09-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202410', 900, '2024-09-30', 1000, '2024-10-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202411', 1000, '2024-10-31', 1100, '2024-11-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2024', '202412', 1100, '2024-11-30', 1200, '2024-12-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2025', '202501', 1200, '2024-12-31', 1300, '2025-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2025', '202502', 1300, '2025-01-31', 1400, '2025-02-28', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2025', '202503', 1400, '2025-02-28', 1500, '2025-03-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2025', '202504', 1500, '2025-03-31', 1600, '2025-04-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2025', '202505', 1600, '2025-04-30', 1700, '2025-05-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2025', '202506', 1700, '2025-05-31', 1800, '2025-06-30', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-110', '321283124S3001', '2025', '202507', 1800, '2025-06-30', 1900, '2025-07-31', 100, NULL, NULL);
-
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202401', 0, '2024-12-31', 1000, '2024-01-31', 100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202402', 1000, '2024-01-31', 2120, '2024-02-28', 1120, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202403', 2120, '2024-02-28', 3345, '2024-03-31', 1225, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202404', 3345, '2024-03-31', 4478, '2024-04-30', 1133, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202405', 4478, '2024-04-30', 5521, '2024-05-31', 1043, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202406', 5521, '2024-05-31', 6793, '2024-06-30', 1272, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202407', 6793, '2024-06-30', 7886, '2024-07-31', 1093, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202408', 7886, '2024-07-31', 8947, '2024-08-31', 1061, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202409', 8947, '2024-08-31', 10158, '2024-09-30', 1211, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202410', 10158, '2024-09-30', 11700, '2024-10-31', 1542, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202411', 11700, '2024-10-31', 13520, '2024-11-30', 1820, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2024', '202412', 13520, '2024-11-30', 14720, '2024-12-31', 1200, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2025', '202501', 14720, '2024-12-31', 16720, '2025-01-31', 1200, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2025', '202502', 16720, '2025-01-31', 18820, '2025-02-28', 2100, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2025', '202503', 18820, '2025-02-28', 19900, '2025-03-31', 1080, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2025', '202504', 19900, '2025-03-31', 21325, '2025-04-30', 1425, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2025', '202505', 21325, '2025-04-30', 22536, '2025-05-31', 1211, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2025', '202506', 22536, '2025-05-31', 24286, '2025-06-30', 1750, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z101', '321283124S3001', '2025', '202507', 24286, '2025-06-30', 25790, '2025-07-31', 1504, NULL, NULL);
-
-
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202401', 0, '2023-12-31', 25, '2024-01-31', 1250, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202402', 25, '2024-01-31', 73, '2024-02-28', 2400, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202403', 73, '2024-02-28', 133, '2024-03-31', 3000, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202404', 133, '2024-03-31', 187, '2024-04-30', 2700, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202405', 187, '2024-04-30', 242, '2024-05-31', 2750, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202406', 242, '2024-05-31', 293, '2024-06-30', 2550, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202407', 293, '2024-06-30', 387, '2024-07-31', 4700, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202408', 387, '2024-07-31', 465, '2024-08-31', 3900, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202409', 465, '2024-08-31', 612, '2024-09-30', 7350, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202410', 612, '2024-09-30', 758, '2024-10-30', 7300, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202411', 758, '2024-10-31', 948, '2024-11-30', 9500, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202412', 948, '2024-11-30', 1237, '2024-12-31', 14450, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2025', '202501', 1237, '2024-12-31', 1547, '2025-01-31', 15500, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2025', '202502', 1547, '2025-01-31', 1823, '2025-02-28', 13800, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2025', '202503', 1823, '2025-02-28', 2074, '2025-03-31', 12550, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2025', '202504', 2074, '2025-03-31', 2322, '2025-04-30', 12400, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2025', '202505', 2322, '2025-04-30', 2741, '2025-05-31', 20950, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2025', '202506', 2741, '2025-05-31', 3000, '2025-06-30', 12950, NULL, NULL);
-INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2025', '202507', 3000, '2025-06-30', 3200, '2025-07-31', 10000, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202402', 100, '2024-01-31', 238, '2024-02-28', 138, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202403', 238, '2024-02-28', 365, '2024-03-31', 127, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202404', 365, '2024-03-31', 537, '2024-04-30', 172, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202405', 537, '2024-04-30', 686, '2024-05-31', 149, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202406', 686, '2024-05-31', 921, '2024-06-30', 235, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202407', 921, '2024-06-30', 1189, '2024-07-31', 268, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202408', 1189, '2024-07-31', 1464, '2024-08-31', 275, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202409', 1464, '2024-08-31', 1797, '2024-09-30', 333, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202410', 1797, '2024-09-30', 2045, '2024-10-31', 248, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202411', 2045, '2024-10-31', 2345, '2024-11-30', 300, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2024', '202412', 2345, '2024-11-30', 2570, '2024-12-31', 225, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2025', '202501', 2570, '2024-12-31', 2815, '2025-01-31', 245, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2025', '202502', 2815, '2025-01-31', 3123, '2025-02-28', 308, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2025', '202503', 3123, '2025-02-28', 3441, '2025-03-31', 318, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2025', '202504', 3441, '2025-03-31', 3853, '2025-04-30', 412, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2025', '202505', 3853, '2025-04-30', 4211, '2025-05-31', 358, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2025', '202506', 4211, '2025-05-31', 4605, '2025-06-30', 394, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-E-B-101', '321283124S3001', '2025', '202507', 4605, '2025-06-30', 5016, '2025-07-31', 411, NULL, NULL);
+
+
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202401', 0, '2023-12-31', 100, '2024-01-31', 100, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202402', 100, '2024-01-31', 238, '2024-02-28', 138, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202403', 238, '2024-02-28', 365, '2024-03-31', 127, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202404', 365, '2024-03-31', 537, '2024-04-30', 172, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202405', 537, '2024-04-30', 686, '2024-05-31', 149, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202406', 686, '2024-05-31', 921, '2024-06-30', 235, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202407', 921, '2024-06-30', 1189, '2024-07-31', 268, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202408', 1189, '2024-07-31', 1464, '2024-08-31', 275, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202409', 1464, '2024-08-31', 1797, '2024-09-30', 333, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202410', 1797, '2024-09-30', 2045, '2024-10-31', 248, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202411', 2045, '2024-10-31', 2345, '2024-11-30', 300, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2024', '202412', 2345, '2024-11-30', 2620, '2024-12-31', 275, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2025', '202501', 2620, '2024-12-31', 2877, '2025-01-31', 257, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2025', '202502', 2877, '2025-01-31', 3111, '2025-02-28', 234, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2025', '202503', 3111, '2025-02-28', 3254, '2025-03-31', 143, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2025', '202504', 3254, '2025-03-31', 3452, '2025-04-30', 198, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2025', '202505', 3452, '2025-04-30', 3666, '2025-05-31', 214, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2025', '202506', 3666, '2025-05-31', 3915, '2025-06-30', 249, NULL, NULL);
+INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-W-B-102', '321283124S3001', '2025', '202507', 3915, '2025-06-30', 4182, '2025-07-31', 267, NULL, NULL);
+
+
 
 
 -- 台账数据