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

fix 报错

V0.5.x
jay 2023-05-31 11:05:23 +08:00
parent 106763d291
commit 90e95fe247
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@
*/
package cc.iotkit.manager.controller;
import cc.iotkit.common.api.PageRequest;
import cc.iotkit.common.enums.ErrCode;
import cc.iotkit.common.exception.BizException;
import cc.iotkit.common.satoken.utils.AuthUtil;
@ -18,6 +19,7 @@ import cc.iotkit.manager.service.DataOwnerService;
import cc.iotkit.common.api.Paging;
import cc.iotkit.model.device.VirtualDevice;
import cc.iotkit.model.device.VirtualDeviceLog;
import cc.iotkit.model.product.Product;
import cc.iotkit.temporal.IVirtualDeviceLogData;
import cc.iotkit.virtualdevice.VirtualManager;
import io.swagger.annotations.Api;
@ -44,13 +46,12 @@ public class VirtualDeviceController {
@PostMapping("/list/{size}/{page}")
public Paging<VirtualDevice> getDevices(
@PathVariable("size") int size,
@PathVariable("page") int page) {
PageRequest<VirtualDevice> pageRequest) {
String uid = AuthUtil.getUserId();
if (AuthUtil.isAdmin()) {
return virtualDeviceData.findAll(page, size);
return virtualDeviceData.findAll(pageRequest);
} else {
return virtualDeviceData.findByUid(uid, page, size);
return virtualDeviceData.findByUid(uid, pageRequest.getPageNum(), pageRequest.getPageNum());
}
}