|
@@ -58,17 +58,17 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
.execute(() -> {
|
|
|
//系统信息
|
|
|
DeviceSysinfoDto.Vo deviceSysinfo = deviceSysinfoService.get(new DeviceSysinfoDto.Vo().setDeviceId(deviceInfo.getDeviceId())).getData();
|
|
|
- deviceInfo.setDeviceSysinfo(Emptys.check(deviceSysinfo) ? deviceSysinfo : null);
|
|
|
+ deviceInfo.setDeviceSysinfo(deviceSysinfo);
|
|
|
})
|
|
|
.execute(() -> {
|
|
|
//状态信息
|
|
|
DeviceStatusDto.Vo deviceStatus = deviceStatusService.obj(new DeviceStatusDto.Vo().setDeviceId(deviceInfo.getDeviceId())).getData();
|
|
|
- deviceInfo.setDeviceStatus(Emptys.check(deviceStatus) ? deviceStatus : null);
|
|
|
+ deviceInfo.setDeviceStatus(deviceStatus);
|
|
|
})
|
|
|
.execute(() -> {
|
|
|
//注册信息
|
|
|
DeviceRegisterDto.Vo deviceRegister = deviceRegisterService.obj(new DeviceRegisterDto.Vo().setDeviceId(deviceInfo.getDeviceId())).getData();
|
|
|
- deviceInfo.setDeviceRegister(Emptys.check(deviceRegister) ? deviceRegister : null);
|
|
|
+ deviceInfo.setDeviceRegister(deviceRegister);
|
|
|
})
|
|
|
.end();
|
|
|
return R.ok(deviceInfo);
|