Browse Source

更新!11

TRX 1 year ago
parent
commit
b8256257bd

+ 10 - 1
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/devices/DeviceController.java

@@ -65,7 +65,16 @@ public class DeviceController {
     public ResultContent<Page<DeviceInfoModel>> pageActivity(
             @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
             @Parameter(required = false) DeviceInfoSearchParam param) {
-        param.setDeviceCategorys(List.of(DeviceCategory.DE));
+//        param.setDeviceCategorys(List.of(DeviceCategory.DE));
+        return deviceInfoService.pageDevice(pageable, param);
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "设备列表-分页查询")
+    @RequestMapping(value = {"pageDevice"}, method = {RequestMethod.POST})
+    public ResultContent<Page<DeviceInfoModel>> pageDevice(
+            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+            @Parameter(required = false) DeviceInfoSearchParam param) {
         return deviceInfoService.pageDevice(pageable, param);
     }