修改接口system/devicemodel/list分页

This commit is contained in:
2026-05-08 13:37:50 +08:00
parent 7b123c0a11
commit c92e2a59a6
3 changed files with 17 additions and 8 deletions

View File

@@ -1,5 +1,7 @@
package com.maibu.web.controller.system; package com.maibu.web.controller.system;
import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.maibu.annotation.Log; import com.maibu.annotation.Log;
import com.maibu.core.business.Device; import com.maibu.core.business.Device;
import com.maibu.core.business.DeviceModel;import com.maibu.core.business.DeviceRunStatistics; import com.maibu.core.business.DeviceModel;import com.maibu.core.business.DeviceRunStatistics;
@@ -11,6 +13,7 @@ import com.maibu.mapper.DeviceRunStatisticsMapper;
import com.maibu.mybatis.LambdaQueryWrapperX; import com.maibu.mybatis.LambdaQueryWrapperX;
import com.maibu.service.IDeviceService; import com.maibu.service.IDeviceService;
import com.maibu.service.SysDeviceModelService; import com.maibu.service.SysDeviceModelService;
import com.maibu.utils.ServletUtils;
import com.maibu.utils.StringUtils; import com.maibu.utils.StringUtils;
import com.maibu.utils.poi.ExcelUtil; import com.maibu.utils.poi.ExcelUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -73,9 +76,13 @@ public class SysDeviceModelController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询设备模型列表") @ApiOperation("查询设备模型列表")
public TableDataInfo list(DeviceModel deviceModel) { public TableDataInfo list(DeviceModel deviceModel) {
startPage(); Integer pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
List<DeviceModel> list = deviceModelService.selectDeviceModelList(deviceModel); Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
return getDataTable(list);
Page<DeviceModel> page = new Page<>(pageNum, pageSize);
Page<DeviceModel> resultPage = deviceModelService.selectDeviceModelPage(page, deviceModel);
return getDataTable(resultPage.getRecords(), resultPage.getTotal());
} }

View File

@@ -1,5 +1,6 @@
package com.maibu.service; package com.maibu.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.maibu.core.business.DeviceModel; import com.maibu.core.business.DeviceModel;
import java.util.List; import java.util.List;
@@ -18,11 +19,12 @@ public interface SysDeviceModelService {
int insertDeviceModel(DeviceModel deviceModel); int insertDeviceModel(DeviceModel deviceModel);
/** /**
*查询设备模型列表 * 分页查询设备模型列表
* @param deviceModel * @param page 分页对象
* @return * @param deviceModel 查询条件
* @return 分页结果
*/ */
List<DeviceModel> selectDeviceModelList(DeviceModel deviceModel); Page<DeviceModel> selectDeviceModelPage(Page<DeviceModel> page, DeviceModel deviceModel);
/** /**
* selectDeviceModelById * selectDeviceModelById