|
@@ -147,8 +147,8 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
|
|
}
|
|
}
|
|
//检查费用
|
|
//检查费用
|
|
deviceIds.forEach(deviceId -> {
|
|
deviceIds.forEach(deviceId -> {
|
|
- R deviceChargingCheck = deviceChargingService.check(new DeviceChargingDto.Check().setDeviceId(deviceId));
|
|
|
|
- R deviceAlgorithmChargingCheck = deviceAlgorithmChargingService.check(new DeviceAlgorithmChargingDto.Check().setDeviceId(deviceId));
|
|
|
|
|
|
+ R deviceChargingCheck = active.getIsDeviceCharging() ? deviceChargingService.check(new DeviceChargingDto.Check().setDeviceId(deviceId)) : R.ok();
|
|
|
|
+ R deviceAlgorithmChargingCheck = active.getIsDeviceAlgorithmCharging() ? deviceAlgorithmChargingService.check(new DeviceAlgorithmChargingDto.Check().setDeviceId(deviceId)) : R.ok();
|
|
if (deviceChargingCheck.getCode() != R.Enum.SUCCESS.getCode() && deviceAlgorithmChargingCheck.getCode() != R.Enum.SUCCESS.getCode()) {
|
|
if (deviceChargingCheck.getCode() != R.Enum.SUCCESS.getCode() && deviceAlgorithmChargingCheck.getCode() != R.Enum.SUCCESS.getCode()) {
|
|
MercMiniDeviceDto.ActiveVo activeVo = new MercMiniDeviceDto.ActiveVo()
|
|
MercMiniDeviceDto.ActiveVo activeVo = new MercMiniDeviceDto.ActiveVo()
|
|
.setDeviceId(deviceId)
|
|
.setDeviceId(deviceId)
|