diff --git a/ruoyi-service/src/main/java/com/ruoyi/system/user/service/impl/UserConverterImpl.java b/ruoyi-service/src/main/java/com/ruoyi/system/user/service/impl/UserConverterImpl.java index feb6b6a..a248c94 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/system/user/service/impl/UserConverterImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/system/user/service/impl/UserConverterImpl.java @@ -27,6 +27,8 @@ public class UserConverterImpl implements UserConverter { vo.setSex(data.getSex()); vo.setAvatar(data.getAvatar()); vo.setStatus(data.getStatus()); + vo.setWithdrawServiceType(data.getWithdrawServiceType()); + vo.setWithdrawServiceValue(data.getWithdrawServiceValue()); return vo; } @@ -49,6 +51,8 @@ public class UserConverterImpl implements UserConverter { vo.setSex(data.getSex()); vo.setAvatar(data.getAvatar()); vo.setStatus(data.getStatus()); + vo.setWithdrawServiceType(data.getWithdrawServiceType()); + vo.setWithdrawServiceValue(data.getWithdrawServiceValue()); return vo; } diff --git a/ruoyi-web/src/main/java/com/ruoyi/task/device/DeviceTask.java b/ruoyi-web/src/main/java/com/ruoyi/task/device/DeviceTask.java index 9bf58b4..23d4027 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/task/device/DeviceTask.java +++ b/ruoyi-web/src/main/java/com/ruoyi/task/device/DeviceTask.java @@ -7,6 +7,8 @@ import com.ruoyi.bst.device.service.DeviceIotService; import lombok.extern.slf4j.Slf4j; +import java.util.ArrayList; + @Component @Slf4j public class DeviceTask { @@ -16,7 +18,7 @@ public class DeviceTask { // 监控所有设备 public void monitorAll() { - deviceIotService.monitor(null); + deviceIotService.monitor(new ArrayList<>()); } - + }