用水量统计

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/MeterReadRecordServiceImpl.java

@@ -692,10 +692,10 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 	@Override
 	public WaterConsumptionSummaryDto waterConsumptionSummary(CommonQueryCondition condition) {
 		log.info("begin MeterReadRecordService waterConsumptionSummary, params = " + JSON.toJSONString(condition));
-		//WaterConsumptionSummaryDto result = meterReadRecordMapper.getSummary(condition);
+		WaterConsumptionSummaryDto result = meterReadRecordMapper.getSummary(condition);
 
 		//切换MongoDB查询
-		WaterConsumptionSummaryDto result = mongoMeterReadRecordService.getSummary(condition);
+		//WaterConsumptionSummaryDto result = mongoMeterReadRecordService.getSummary(condition);
 		log.info("end MeterReadRecordService waterConsumptionSummary, result = " + JSON.toJSONString(result));
 		return result;
 	}
@@ -703,12 +703,12 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService{
 	@Override
 	public Pagination<WaterConsumptionDto> getWaterConsumptionList(CommonQueryCondition condition, Integer pageNum, Integer pageSize) {
 		log.info("begin MeterReadRecordService getWaterConsumptionList, params = " + JSON.toJSONString(condition) + ", pageNum = " + pageNum + ", pageSize = " + pageSize);
-		//PageHelper.startPage(pageNum, pageSize);
-		//List<WaterConsumptionDto> result = meterReadRecordMapper.getList(condition);
-		//return new Pagination<>(result);
+		PageHelper.startPage(pageNum, pageSize);
+		List<WaterConsumptionDto> result = meterReadRecordMapper.getList(condition);
+		return new Pagination<>(result);
 
 		//切换MongoDB查询
-		return mongoMeterReadRecordService.getWaterConsumptionPage(condition,pageNum,pageSize);
+		//return mongoMeterReadRecordService.getWaterConsumptionPage(condition,pageNum,pageSize);
 	}
 
 	@Async