feat: add convert data filter

@@ -210,8 +210,13 @@ public class TkDeviceController extends BaseController {
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   @PostMapping(params = {PAGE_SIZE, PAGE})
   @PostMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("查询")
   @ApiOperation("查询")
-  public TkPageData<DeviceDTO> pageDevice(@RequestBody  Map<String,Object> queryMap)
+  public TkPageData<DeviceDTO> pageDevice(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestBody Map<String, Object> queryMap)
       throws ThingsboardException {
       throws ThingsboardException {
+    queryMap.put(PAGE, page);
+    queryMap.put(PAGE_SIZE, pageSize);
     // 如果当前用户是客户
     // 如果当前用户是客户
     if (getCurrentUser().isCustomerUser()) {
     if (getCurrentUser().isCustomerUser()) {
       queryMap.put("customerId", getCurrentUser().getCustomerId().toString());
       queryMap.put("customerId", getCurrentUser().getCustomerId().toString());
@@ -442,7 +447,10 @@ public class TkDeviceController extends BaseController {
     DeviceProfileId deviceProfileId =
     DeviceProfileId deviceProfileId =
         new DeviceProfileId(UUID.fromString(deviceDTO.getProfileId()));
         new DeviceProfileId(UUID.fromString(deviceDTO.getProfileId()));
 
 
-    CustomerId customerId = StringUtils.isBlank(deviceDTO.getCustomerId())?null:new CustomerId(UUID.fromString(deviceDTO.getCustomerId()));
+    CustomerId customerId =
+        StringUtils.isBlank(deviceDTO.getCustomerId())
+            ? null
+            : new CustomerId(UUID.fromString(deviceDTO.getCustomerId()));
 
 
     tbDevice.setAdditionalInfo(additionalInfo);
     tbDevice.setAdditionalInfo(additionalInfo);
     tbDevice.setCustomerId(customerId);
     tbDevice.setCustomerId(customerId);