调度预案

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/entity/MeterReadWaterRecord.java

@@ -41,41 +41,9 @@ public class MeterReadWaterRecord {
     @ApiModelProperty(value="用水量")
     private BigDecimal waterConsumption;
 
-
-    /**
-     * 创建时间
-     **/
-    private Date createTime;
-
     private LocalDateTime createDate;
 
     private LocalDateTime updateDate;
 
 
-    /**
-     * 创建人名称
-     **/
-    private String creatorName;
-
-    /**
-     * 创建人Id
-     **/
-    private String creatorId;
-
-    /**
-     * 修改人Id
-     **/
-    private String modifierId;
-
-    /**
-     * 修改人名称
-     **/
-    private String modifierName;
-
-    /**
-     * 修改时间
-     **/
-    private Date updateTime;
-
-
 }

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

@@ -41,14 +41,6 @@ import java.util.List;
 public class MeterReadRecordServiceImpl implements MeterReadRecordService {
 
 
-    @Autowired
-    private CacheClient cacheClient;
-
-    /**
-     * 水表最后数据缓存前缀
-     */
-    public static final String PREFIX_CACHE_FLAG = "last-meter-data:";
-
     @Resource
     private MeterReadRecordDao meterReadRecordDao;
 
@@ -76,8 +68,8 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService {
         BigDecimal lastCost = new BigDecimal("0");
         if (queryDate == currentDate) {
             // 获取上一个记录
-            MeterReadRecordVo prevVo = findPrevRecord(dto.getId(), queryDate);
-            if (prevVo != null &&prevVo.getData().getReadData() != null) {
+            MeterReadRecordVo prevVo = this.findPrevRecord(dto.getId(), queryDate);
+            if (prevVo != null && prevVo.getData().getReadData() != null) {
                 prevReadData = prevVo.getData().getReadData();
             }
             // 当前用水量 = 当前读数 - 上一次读数
@@ -139,16 +131,4 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService {
         return meterReadRecordDao.findMeterReadRecord(id, criteria ,"data.readDate", Sort.Direction.DESC);
     }
 
-    /**
-    * 获取下一个记录
-    * @author Andy
-    * @date 10:21 2021/8/30
-    * @param id:
-    * @param currentDate: 当前时间
-    * @return com.zcxk.rmcp.api.vo.MeterReadRecordVo
-    **/
-    private MeterReadRecordVo findNextRecord(Long id, Integer currentDate){
-        return meterReadRecordDao.findMeterReadRecord(id, Criteria.where("data.readDate").gt(currentDate) ,"data.readDate", Sort.Direction.ASC);
-    }
-
 }