|
@@ -180,13 +180,10 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
|
|
|
});
|
|
|
//处理无期限
|
|
|
infs.forEach(deviceAlgorithmChargingHistory -> {
|
|
|
- SysDictRedis algorithmMoonConfigDict = algorithmMoonConfigMaps.get(deviceAlgorithmChargingHistory.getAlgorithmId().toString());
|
|
|
- DeviceAlgorithmChargingDto.AlgorithmMoonConfig algorithmMoonConfig = JSONUtil.parseObj(algorithmMoonConfigDict.getValue()).toBean(DeviceAlgorithmChargingDto.AlgorithmMoonConfig.class);
|
|
|
- DeviceAlgorithmChargingDto.AlgorithmMoonConfig.Inf inf = algorithmMoonConfig.getInf();
|
|
|
DeviceAlgorithmCharging deviceAlgorithmChargingInfo = new DeviceAlgorithmCharging()
|
|
|
.setDeviceId(deviceAlgorithmChargingHistory.getDeviceId())
|
|
|
.setAlgorithmId(deviceAlgorithmChargingHistory.getAlgorithmId())
|
|
|
- .setUnusedSize(inf.getSize() * deviceAlgorithmChargingHistory.getChargingSize())
|
|
|
+ .setUnusedSize(deviceAlgorithmChargingHistory.getChargingSize())
|
|
|
.setType(deviceAlgorithmChargingHistory.getType())
|
|
|
.setName(deviceAlgorithmChargingHistory.getName())
|
|
|
.setTimeout(-1)
|