瀏覽代碼

!40 fix: 修复获取虚拟设备列表分页BUG
Merge pull request !40 from 张鹏翔/dev-V0.5.0

xiwa 1 年之前
父節點
當前提交
062c9568a9

+ 2 - 2
iot-dao/iot-data-model/src/main/java/cc/iotkit/model/device/VirtualDevice.java

@@ -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;
 
 }

+ 2 - 1
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java

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