zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!40 fix: 修复获取虚拟设备列表分页BUG 

Merge pull request !40 from 张鹏翔/dev-V0.5.0
V0.5.x
xiwa 2024-02-24 02:09:36 +00:00 committed by Gitee
parent c06bf77aa2 6e6c3290be
commit 062c9568a9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/device/VirtualDevice.java
View File

@ -97,11 +97,11 @@ public class VirtualDevice implements Owned<String> {
/** /**
* 运行状态 * 运行状态
*/ */
private String state = STATE_STOPPED; private String state;
/** /**
* 创建时间 * 创建时间
*/ */
private Long createAt = System.currentTimeMillis(); private Long createAt;
} }

3
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java
View File

@ -15,6 +15,7 @@ import cc.iotkit.common.api.Request;
import cc.iotkit.common.enums.ErrCode; import cc.iotkit.common.enums.ErrCode;
import cc.iotkit.common.exception.BizException; import cc.iotkit.common.exception.BizException;
import cc.iotkit.common.utils.ReflectUtil; import cc.iotkit.common.utils.ReflectUtil;
import cc.iotkit.common.validate.QueryGroup;
import cc.iotkit.data.manager.IVirtualDeviceData; import cc.iotkit.data.manager.IVirtualDeviceData;
import cc.iotkit.manager.dto.bo.ChangeStateBo; import cc.iotkit.manager.dto.bo.ChangeStateBo;
import cc.iotkit.manager.dto.bo.device.DeviceLogQueryBo; import cc.iotkit.manager.dto.bo.device.DeviceLogQueryBo;
@ -56,7 +57,7 @@ public class VirtualDeviceController {
@ApiOperation("获取虚拟设备列表") @ApiOperation("获取虚拟设备列表")
@SaCheckPermission("iot:virtualDevice:query") @SaCheckPermission("iot:virtualDevice:query")
@PostMapping("/list") @PostMapping("/list")
public Paging<VirtualDevice> getDevices(PageRequest<VirtualDevice> pageRequest) { public Paging<VirtualDevice> getDevices(@Validated(QueryGroup.class)@RequestBody PageRequest<VirtualDevice> pageRequest) {
return virtualDeviceData.findAll(pageRequest); return virtualDeviceData.findAll(pageRequest);
} }