|
@@ -80,6 +80,9 @@ public class MercMiniDeviceController {
|
|
|
|
|
|
private final DeviceConfigServiceImpl deviceConfigService;
|
|
|
|
|
|
+ private final DeviceTempSetServiceImpl deviceTempSetService;
|
|
|
+
|
|
|
+
|
|
|
@ApiOperation("设备列表带卡包数")
|
|
|
@PostMapping("algorithmChargingDevice")
|
|
|
public R<PageBean<DeviceInfoDto.AlgorithmChargingVo>> algorithmChargingDevice(@RequestBody @Validated DeviceInfoDto.AlgorithmCharging algorithmCharging) {
|
|
@@ -183,8 +186,9 @@ public class MercMiniDeviceController {
|
|
|
vo.setDeviceStatus(deviceStatus);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ //工作温度设置
|
|
|
+ DeviceTempSetDto.Vo lastTempset = R.feignCheckData(deviceTempSetService.getLastOne(new DeviceTempSetDto.GetLastOneDto().setDeviceId(vo.getDeviceId())));
|
|
|
+ vo.setJobTempSetValue(lastTempset == null ? null : lastTempset.getTempValue());
|
|
|
}
|
|
|
|
|
|
DeviceConfig deviceConfig = deviceConfigService.getById(obj.getDeviceId());
|