|
@@ -1,5 +1,6 @@
|
|
|
package com.xy.controller;
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.BooleanUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
@@ -77,7 +78,7 @@ public class MercMiniDeviceController {
|
|
|
|
|
|
private final DeviceStatusServiceImpl deviceStatusService;
|
|
|
|
|
|
- private final DeviceTempSetServiceImpl deviceTempSetService;
|
|
|
+ private final DeviceConfigServiceImpl deviceConfigService;
|
|
|
|
|
|
@ApiOperation("商户设备首页统计")
|
|
|
@PostMapping("mercHomeStatistical")
|
|
@@ -178,8 +179,8 @@ public class MercMiniDeviceController {
|
|
|
|
|
|
}
|
|
|
|
|
|
- DeviceTempSetDto.Vo tempSet = R.feignCheckData(deviceTempSetService.getLastOne(new DeviceTempSetDto.GetLastOneDto().setDeviceId(obj.getDeviceId())));
|
|
|
- vo.setTempSetInfo(tempSet);
|
|
|
+ DeviceConfig deviceConfig = deviceConfigService.getById(obj.getDeviceId());
|
|
|
+ vo.setTempSetInfo(BeanUtil.copyProperties(deviceConfig, DeviceInfoDto.TempSetInfo.class));
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
|