版本更新

zoniot-common/zoniot-core-common/src/main/java/com/zcxk/core/common/util/BeanCopyUtils.java

@@ -77,4 +77,6 @@ public class BeanCopyUtils {
             }
         }
     }
+
+
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/meterReadRecord/MeterReadRecordDeviceDto.java

@@ -0,0 +1,23 @@
+package com.zcxk.rmcp.api.dto.meterReadRecord;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Andy
+ * @version V1.0
+ * @description: 设备记录
+ * @date 2021/7/22
+ **/
+@Data
+public class MeterReadRecordDeviceDto {
+
+    @ApiModelProperty(value="设备ID")
+    private Long deviceId;
+
+    @ApiModelProperty(value="开始日期，YYYYMMDD格式")
+    private Integer startDate;
+
+    @ApiModelProperty(value="结束日期，YYYYMMDD格式")
+    private Integer endDate;
+}

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/ProductMeasuringDictVo.java

@@ -42,9 +42,9 @@ public class ProductMeasuringDictVo {
 
     @JsonIgnore
     @ApiModelProperty(value="创建时间")
-    private LocalDateTime dateCreate;
+    private LocalDateTime createDate;
 
     @JsonIgnore
     @ApiModelProperty(value="更新时间")
-    private LocalDateTime dateUpdate;
+    private LocalDateTime updateDate;
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/mongo/MeterReadRecordDao.java

@@ -158,27 +158,103 @@ public class MeterReadRecordDao extends BaseDao<MeterReadRecord, String> impleme
      * @param year ：年, statDay：具体日期
      * @return void
      **/
-    public List<MeterReadRecordAggregationVo> aggregationCommunityWaterConsumption(int year, int statDay, int pageNum, int pageSzie){
+    public List<MeterReadRecordAggregationVo> aggregationCommunityWaterConsumption(int year, int statDay, int pageNum, int pageSize){
         AggregationOptions aggregationOptions = AggregationOptions.builder().allowDiskUse(true).build();
         List<AggregationOperation> queryCondition = groupCondition(year, statDay, statDay,
                 Aggregation.group("tenantId", "companyOrgId", "deptOrgId",  "communityId", "categoryId", "data.readDate")
                         .sum("$data.lastCost").as("waterConsumption"));
         // 分页条件
-        queryCondition.add(Aggregation.skip(pageNum > 1 ?(pageNum-1) * pageSzie : 0));
-        queryCondition.add(Aggregation.limit(pageSzie));
+        queryCondition.add(Aggregation.skip(pageNum > 1 ?(pageNum-1) * pageSize : 0));
+        queryCondition.add(Aggregation.limit(pageSize));
         AggregationResults<MeterReadRecordAggregationVo> durationData =
                 mongoTemplate.aggregate(Aggregation.newAggregation(queryCondition).withOptions(aggregationOptions),
                         MeterReadRecord.class, MeterReadRecordAggregationVo.class);
         return durationData.getMappedResults();
     }
 
+    /**
+     *
+     * @description 查询结算期的用水量
+     * @author hym
+     * @updateTime 2021/7/28 10:25
+     * @throws
+     */
+
+    public List<MeterReadRecord> querySettlementWaterConsumption(Device device, Date clearingStartDate, Date clearingEndDate) {
+        Criteria criteria = new Criteria();
+        criteria.and("deviceId").is(device.getId());
+        Criteria criteria1 = Criteria.where("data.readDate").lte(Integer.valueOf(
+                DateUtil.formatDate(clearingEndDate,"yyyyMMdd")));
+        Criteria criteria2 = Criteria.where("data.readDate").gte(Integer.valueOf(
+                DateUtil.formatDate(clearingStartDate,"yyyyMMdd")));
+        Criteria dayCritera = new Criteria();
+        dayCritera.orOperator(criteria1,criteria2);
+        List<AggregationOperation> countQuery =aggrQueryCondition(criteria,"data",
+                dayCritera,null);
+
+        AggregationOptions aggregationOptions = AggregationOptions.builder().allowDiskUse(true).build();
+        AggregationResults<MeterReadRecord> aggregate = mongoTemplate.aggregate(Aggregation.newAggregation(countQuery).withOptions(aggregationOptions)
+                , MeterReadRecord.class, MeterReadRecord.class);
+        return aggregate.getMappedResults();
+    }
+
     /**
     * @author Andy
-    * @description 查询条件
-    * @date 10:37 2021/7/23
-    * @param dto, query
-    * @return java.util.List<org.springframework.data.mongodb.core.aggregation.AggregationOperation>
+    * @description 根据设备ID和读表日期小于endDate，查询设备数据
+    * @date 17:25 2021/8/2
+    * @param id, endDate
+    * @return java.util.List<com.zcxk.rmcp.core.mongo.MeterReadRecord>
+    **/
+    public List<MeterReadRecord> queryDeviceMeterReadRecordWithCondtion(Long id, int endDate) {
+        return listSingleDeviceTimeData(id, null, endDate);
+    }
+
+    /**
+    * @author Andy
+    * @description 根据设备ID和读表日期大于startDate且小于endDate，查询设备记录
+    * @date 17:26 2021/8/2
+    * @param id, startDate, endDate
+    * @return java.util.List<com.zcxk.rmcp.core.mongo.MeterReadRecord>
+    **/
+    public List<MeterReadRecord> queryDeviceMeterReadRecordWithCondtion(Long id, Integer startDate, Integer endDate) {
+        return listSingleDeviceTimeData(id, startDate, endDate);
+    }
+
+    /**
+    * @author Andy
+    * @description 根据设备ID和读表日期大于startDate且小于endDate， 查询设备数据
+    * @date 17:26 2021/8/2
+    * @param deviceId, startDate, endDate
+    * @return java.util.List<com.zcxk.rmcp.core.mongo.MeterReadRecord>
     **/
+    public List<MeterReadRecord> listSingleDeviceTimeData(Long deviceId, Integer startDate, Integer endDate){
+        Criteria criteria = new Criteria();
+        criteria.and("deviceId").is(deviceId);
+        Criteria dayCritera = new Criteria();
+        if (startDate != null && endDate != null) {
+            dayCritera.and("data.readDate").gte(startDate).lte(endDate);
+        } else if (startDate != null) {
+            dayCritera.and("data.readDate").gte(startDate);
+        } else if (endDate != null) {
+            dayCritera.and("data.readDate").lte(endDate);
+        }
+        List<AggregationOperation> countQuery = aggrQueryCondition(criteria,"data",
+                dayCritera,null);
+        countQuery.add(Aggregation.sort(Sort.Direction.DESC,"data.readTime"));
+        AggregationOptions aggregationOptions = AggregationOptions.builder().allowDiskUse(true).build();
+        AggregationResults<MeterReadRecord> aggregate = mongoTemplate.aggregate(Aggregation.newAggregation(countQuery).withOptions(aggregationOptions)
+                , MeterReadRecord.class, MeterReadRecord.class);
+        return aggregate.getMappedResults();
+    }
+
+
+    /**
+     * @author Andy
+     * @description 查询条件
+     * @date 10:37 2021/7/23
+     * @param dto, query
+     * @return java.util.List<org.springframework.data.mongodb.core.aggregation.AggregationOperation>
+     **/
     private List<AggregationOperation> queryCondition(MeterReadRecordDto dto, UserCondition userCondition){
         LocalDate localDate;
         List<AggregationOperation> commonOperations = new ArrayList<>();
@@ -228,12 +304,12 @@ public class MeterReadRecordDao extends BaseDao<MeterReadRecord, String> impleme
 
 
     /**
-    * @author Andy
-    * @description 分组查询
-    * @date 18:36 2021/7/27
-    * @param year, beginDate, endDate, groupOperation
-    * @return java.util.List<org.springframework.data.mongodb.core.aggregation.AggregationOperation>
-    **/
+     * @author Andy
+     * @description 分组查询
+     * @date 18:36 2021/7/27
+     * @param year, beginDate, endDate, groupOperation
+     * @return java.util.List<org.springframework.data.mongodb.core.aggregation.AggregationOperation>
+     **/
     private List<AggregationOperation> groupCondition(int year, int readDateBeginDate, int readDateEndDate, GroupOperation groupOperation){
         Criteria criteria = new Criteria();
         criteria.and("year").is(year);
@@ -247,12 +323,12 @@ public class MeterReadRecordDao extends BaseDao<MeterReadRecord, String> impleme
     }
 
     /**
-    * @author Andy
-    * @description 获取总条数
-    * @date 10:34 2021/7/23
-    * @param commonOperations
-    * @return int
-    **/
+     * @author Andy
+     * @description 获取总条数
+     * @date 10:34 2021/7/23
+     * @param commonOperations
+     * @return int
+     **/
     private int getAggregationCount(List<AggregationOperation> commonOperations)  {
         List<AggregationOperation> countQuery = new ArrayList<>(commonOperations);
         countQuery.add(Aggregation.count().as("count"));
@@ -264,45 +340,4 @@ public class MeterReadRecordDao extends BaseDao<MeterReadRecord, String> impleme
         List<Map> mappedResults = aggregate.getMappedResults();
         return CollectionUtils.isEmpty(mappedResults) ? 0 : ZoniotIntegerUtils.parseInt(mappedResults.get(0).get("count"));
     }
-    /**
-     *
-     * @description 查询结算期的用水量
-     * @author hym
-     * @updateTime 2021/7/28 10:25
-     * @throws
-     */
-
-    public List<MeterReadRecord> querySettlementWaterConsumption(Device device, Date clearingStartDate, Date clearingEndDate) {
-
-
-        Criteria criteria = new Criteria();
-        criteria.and("deviceId").is(device.getId());
-        Criteria criteria1 = Criteria.where("data.readDate").lte(Integer.valueOf(
-                DateUtil.formatDate(clearingEndDate,"yyyyMMdd")));
-        Criteria criteria2 = Criteria.where("data.readDate").gte(Integer.valueOf(
-                DateUtil.formatDate(clearingStartDate,"yyyyMMdd")));
-        Criteria dayCritera = new Criteria();
-        dayCritera.orOperator(criteria1,criteria2);
-        List<AggregationOperation> countQuery =aggrQueryCondition(criteria,"data",
-                dayCritera,null);
-
-        AggregationOptions aggregationOptions = AggregationOptions.builder().allowDiskUse(true).build();
-        AggregationResults<MeterReadRecord> aggregate = mongoTemplate.aggregate(Aggregation.newAggregation(countQuery).withOptions(aggregationOptions)
-                , MeterReadRecord.class, MeterReadRecord.class);
-        return aggregate.getMappedResults();
-    }
-
-    public List<MeterReadRecord> queryDeviceMeterReadRecordWithCondtion(Long id, int endDate) {
-        Criteria criteria = new Criteria();
-        criteria.and("deviceId").is(id);
-        Criteria dayCritera = new Criteria();
-        dayCritera.and("data.readDate").lte(endDate);
-        List<AggregationOperation> countQuery =aggrQueryCondition(criteria,"data",
-                dayCritera,null);
-        countQuery.add(Aggregation.sort(Sort.Direction.DESC,"data.readTime"));
-        AggregationOptions aggregationOptions = AggregationOptions.builder().allowDiskUse(true).build();
-        AggregationResults<MeterReadRecord> aggregate = mongoTemplate.aggregate(Aggregation.newAggregation(countQuery).withOptions(aggregationOptions)
-                , MeterReadRecord.class, MeterReadRecord.class);
-        return aggregate.getMappedResults();
-    }
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ProductMeasuringDictMapper.xml

@@ -18,8 +18,8 @@
 
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    point_id, data_value, data_name, data_desc, `status`, create_by, update_by, date_create, 
-    date_update
+    point_id, data_value, data_name, data_desc, `status`, create_by, update_by, create_date,
+    update_date
   </sql>
   <insert id="insertSelective" parameterType="com.zcxk.rmcp.core.entity.ProductMeasuringDict">
     <!--@mbg.generated-->
@@ -47,10 +47,10 @@
         update_by,
       </if>
       <if test="dateCreate != null">
-        date_create,
+        create_date,
       </if>
       <if test="dateUpdate != null">
-        date_update,
+        dupdate_date,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -75,11 +75,11 @@
       <if test="updateBy != null">
         #{updateBy},
       </if>
-      <if test="dateCreate != null">
-        #{dateCreate},
+      <if test="createDate != null">
+        #{createDate},
       </if>
-      <if test="dateUpdate != null">
-        #{dateUpdate},
+      <if test="updateDate != null">
+        #{updateDate},
       </if>
     </trim>
   </insert>
@@ -101,11 +101,11 @@
       <if test="updateBy != null">
         update_by = #{updateBy},
       </if>
-      <if test="dateCreate != null">
-        date_create = #{dateCreate},
+      <if test="createDate != null">
+        create_date = #{createDate},
       </if>
-      <if test="dateUpdate != null">
-        date_update = #{dateUpdate},
+      <if test="updateDate != null">
+        update_date = #{updateDate},
       </if>
     </set>
     where point_id = #{pointId}

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ProductMeasuringPointMapper.xml

@@ -12,15 +12,15 @@
     <result column="measuring_unit" property="measuringUnit" />
     <result column="measuring_data_type" property="measuringDataType" />
     <result column="status" property="status" />
-    <result column="date_create" property="dateCreate" />
-    <result column="date_update" property="dateUpdate" />
+    <result column="create_date" property="createDate" />
+    <result column="update_date" property="updateDate" />
     <result column="create_date" property="createDate" />
     <result column="update_date" property="updateDate" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, product_id, measuring_code, measuring_name, measuring_desc, measuring_unit, measuring_data_type, 
-    `status`, date_create, date_update, create_by, update_by
+    `status`, create_date, update_date, create_by, update_by
   </sql>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zcxk.rmcp.core.entity.ProductMeasuringPoint" useGeneratedKeys="true">
     <!--@mbg.generated-->
@@ -47,11 +47,11 @@
       <if test="status != null">
         `status`,
       </if>
-      <if test="dateCreate != null">
-        date_create,
+      <if test="createDate != null">
+        create_date,
       </if>
-      <if test="dateUpdate != null">
-        date_update,
+      <if test="updateDate != null">
+        update_date,
       </if>
       <if test="createBy != null">
         create_by,
@@ -82,11 +82,11 @@
       <if test="status != null">
         #{status},
       </if>
-      <if test="dateCreate != null">
-        #{dateCreate},
+      <if test="createDate != null">
+        #{createDate},
       </if>
-      <if test="dateUpdate != null">
-        #{dateUpdate},
+      <if test="updateDate != null">
+        #{updateDate},
       </if>
       <if test="createBy != null">
         #{createBy},
@@ -121,11 +121,11 @@
       <if test="status != null">
         `status` = #{status},
       </if>
-      <if test="dateCreate != null">
-        date_create = #{dateCreate},
+      <if test="createDate != null">
+        create_date = #{createDate},
       </if>
-      <if test="dateUpdate != null">
-        date_update = #{dateUpdate},
+      <if test="updateDate != null">
+        update_date = #{updateDate},
       </if>
       <if test="createBy != null">
         create_by = #{createBy},
@@ -138,7 +138,7 @@
   </update>
 
     <select id="getList" resultType="com.zcxk.rmcp.api.vo.MeasuringPointVo">
-      select <include refid="Base_Column_List"/> from sc_product_measuring_point where status = 1
+      select <include refid="Base_Column_List"/> from rmcp_product_measuring_point where status = 1
       and product_id = #{productId}
     </select>
 </mapper>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceController.java

@@ -146,7 +146,7 @@ public class DeviceController {
         return AjaxMessage.success();
     }
 
-    @GetMapping("/getData")
+    @PostMapping("/getData")
     @ApiOperation(value = "获取设备数据")
     public AjaxMessage<List<DeviceDataVo>> getData(@RequestBody @Valid DeviceDataDto deviceDataDto) {
         return AjaxMessage.success(dataServiceService.getData(deviceDataDto));

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/MeterReadRecordController.java

@@ -5,6 +5,7 @@ import com.zcxk.core.common.pojo.PageResult;
 import com.zcxk.core.common.util.BeanCopyUtils;
 import com.zcxk.core.utils.DateUtil;
 import com.zcxk.core.utils.export.EasyExcelUtil;
+import com.zcxk.rmcp.api.dto.meterReadRecord.MeterReadRecordDeviceDto;
 import com.zcxk.rmcp.api.dto.meterReadRecord.MeterReadRecordDto;
 import com.zcxk.rmcp.api.dto.meterReadRecord.MeterReadRecordUpdateDto;
 import com.zcxk.rmcp.api.vo.MeterReadRecordExcelVo;
@@ -49,7 +50,7 @@ public class MeterReadRecordController extends BaseController {
 
     @RequestMapping(value = "/update/reading", method = RequestMethod.POST)
     @ApiOperation(value = "更新读数")
-    public AjaxMessage<Long> addMeterReadRecord(@RequestBody @Valid MeterReadRecordUpdateDto readRecord) {
+    public AjaxMessage<Long> updateReadData(@RequestBody @Valid MeterReadRecordUpdateDto readRecord) {
         return AjaxMessage.success(meterReadRecordService.updateReadData(readRecord));
     }
 
@@ -59,6 +60,12 @@ public class MeterReadRecordController extends BaseController {
         return AjaxMessage.success(meterReadRecordService.pageMeterReadRecord(dto));
     }
 
+    @RequestMapping(value = "/list/water/consumption", method = RequestMethod.POST)
+    @ApiOperation(value = "查询单个设备某段时间的用水量")
+    public AjaxMessage<List> listSingleDeviceTimeWaterConsumption(@RequestBody @Valid MeterReadRecordDeviceDto dto) {
+        return AjaxMessage.success(meterReadRecordService.listSingleDeviceTimeWaterConsumption(dto));
+    }
+
     @RequestMapping(value="/export/excel" , method = RequestMethod.POST)
     @ApiOperation(value = "excel导出")
     public AjaxMessage<String> exportExcel(@RequestBody @Valid MeterReadRecordDto dto) {

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/WaterRecordController.java

@@ -2,7 +2,10 @@ package com.zcxk.rmcp.web.controller;
 
 import com.zcxk.core.common.pojo.AjaxMessage;
 import com.zcxk.core.common.pojo.TotalResult;
+import com.zcxk.core.common.util.BeanCopyUtils;
 import com.zcxk.core.utils.DateUtil;
+import com.zcxk.rmcp.api.vo.MeterReadRecordAggregationVo;
+import com.zcxk.rmcp.core.entity.MeterReadWaterRecord;
 import com.zcxk.rmcp.web.service.MeterReadWaterRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -15,7 +18,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author Andy

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/MeterReadRecordService.java

@@ -1,6 +1,7 @@
 package com.zcxk.rmcp.web.service;
 
 import com.zcxk.core.common.pojo.PageResult;
+import com.zcxk.rmcp.api.dto.meterReadRecord.MeterReadRecordDeviceDto;
 import com.zcxk.rmcp.api.dto.meterReadRecord.MeterReadRecordDto;
 import com.zcxk.rmcp.api.dto.meterReadRecord.MeterReadRecordUpdateDto;
 import com.zcxk.rmcp.api.vo.MeterReadRecordVo;
@@ -37,7 +38,7 @@ public interface MeterReadRecordService {
 
     /**
     * @author Andy
-    * @description 分页查询
+    * @description 分页查询当前登录账号的抄表记录
     * @date 17:55 2021/7/22
     * @param dto
     * @return java.util.List<com.zcxk.rmcp.api.vo.MeterReadRecordVo>
@@ -46,10 +47,19 @@ public interface MeterReadRecordService {
 
     /**
     * @author Andy
-    * @description 查询集合
+    * @description 查询当前登录账号的抄表记录
     * @date 11:26 2021/7/23
     * @param dto
     * @return java.util.List<com.zcxk.rmcp.api.vo.MeterReadRecordVo>
     **/
     List<MeterReadRecordVo> listMeterReadRecord(MeterReadRecordDto dto);
+
+    /**
+    * @author Andy
+    * @description 查询单个设备在某一段时间的用水量
+    * @date 17:38 2021/8/2
+    * @param dto
+    * @return java.util.List<com.zcxk.rmcp.api.vo.MeterReadRecordVo>
+    **/
+    List<MeterReadRecord> listSingleDeviceTimeWaterConsumption(MeterReadRecordDeviceDto dto);
 }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/MeterReadRecordServiceImpl.java

@@ -2,7 +2,9 @@ package com.zcxk.rmcp.web.service.impl;
 
 import com.zcxk.core.common.exception.BusinessException;
 import com.zcxk.core.common.pojo.PageResult;
+import com.zcxk.core.oauth2.pojo.LoginUser;
 import com.zcxk.core.oauth2.util.UserUtil;
+import com.zcxk.rmcp.api.dto.meterReadRecord.MeterReadRecordDeviceDto;
 import com.zcxk.rmcp.api.dto.meterReadRecord.MeterReadRecordDto;
 import com.zcxk.rmcp.api.dto.meterReadRecord.MeterReadRecordUpdateDto;
 import com.zcxk.rmcp.api.enums.RmcpErrorEnum;
@@ -35,6 +37,10 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService {
         for (MeterReadRecord.MeterReadInfo datum : readRecord.getData()) {
             datum.setReadTime(new Date());
         }
+        /*LoginUser user = UserUtil.getCurrentUser();
+        readRecord.setTenantId(user.getTenantId());
+        readRecord.setCompanyOrgId(user.getCompanyId());
+        readRecord.setDeptOrgId(user.getDepartmentId());*/
         meterReadRecordDao.saveMeterReadRecord(readRecord);
     }
 
@@ -57,4 +63,9 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService {
     public List<MeterReadRecordVo> listMeterReadRecord(MeterReadRecordDto dto) {
         return meterReadRecordDao.listMeterReadRecord(dto, UserUtil.getCurrentUser().getUserCondition());
     }
+
+    @Override
+    public List<MeterReadRecord> listSingleDeviceTimeWaterConsumption(MeterReadRecordDeviceDto dto) {
+        return meterReadRecordDao.queryDeviceMeterReadRecordWithCondtion(dto.getDeviceId(), dto.getStartDate(),dto.getEndDate());
+    }
 }

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-dev.properties

@@ -104,7 +104,8 @@ spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.template.mandatory=true
 
 #mongodb url
-spring.data.mongodb.uri=mongodb://114.135.61.188:17017/meter-reading-database
+#spring.data.mongodb.uri=mongodb://114.135.61.188:17017/meter-reading-database
+spring.data.mongodb.uri=mongodb://127.0.0.1:27017/meter-reading-database
 logging.level.org.springframework.data.mongodb.core=DEBUG
 
 receive.exchange.name=messageExchangeTest

zoniot-rmcp/zoniot-xxljob-client/src/main/java/com/zcxk/xxljob/jobs/MeterReadWaterRecordHandler.java

@@ -97,4 +97,6 @@ public class MeterReadWaterRecordHandler {
         }
     }
 
+
+
 }