|
|
@ -1321,8 +1321,8 @@ public class RealTargetServiceImpl implements RealTargetService { |
|
|
|
PowerMonthVo generate = new PowerMonthVo(); |
|
|
|
PowerMonthVo generate = new PowerMonthVo(); |
|
|
|
Date time = DateUtil.parse(data.get("ts"), "yyyy-MM-dd HH:mm:ss.s"); |
|
|
|
Date time = DateUtil.parse(data.get("ts"), "yyyy-MM-dd HH:mm:ss.s"); |
|
|
|
generate.setStrMonth(DateUtil.format(time,DateUtil.PATTERN_DATE)); |
|
|
|
generate.setStrMonth(DateUtil.format(time,DateUtil.PATTERN_DATE)); |
|
|
|
generate.setPower(Float.parseFloat(Optional.ofNullable(data.get(HomePageConstant.HYDROPOWER_GENERATE_POWER)) |
|
|
|
// generate.setPower(Float.parseFloat(Optional.ofNullable(data.get(HomePageConstant.HYDROPOWER_GENERATE_POWER))
|
|
|
|
.orElse("0")) * device.getRideCount()); |
|
|
|
// .orElse("0")) * device.getRideCount());
|
|
|
|
return generate; |
|
|
|
return generate; |
|
|
|
}).collect(Collectors.toList())); |
|
|
|
}).collect(Collectors.toList())); |
|
|
|
}); |
|
|
|
}); |
|
|
|