diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java index 6400f56..d8c0a82 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java @@ -107,6 +107,16 @@ public class BusinessConstants { */ public final static String WD_CODE = "温度"; + /** + * 当前记录起始索引 + */ + public static final String PAGE_NUM = "pageNum"; + + /** + * 每页显示记录数 + */ + public static final String PAGE_SIZE = "pageSize"; + public final static Integer CELL_1 = 1; public final static Integer CELL_2 = 2; public final static Integer CELL_3 = 3; diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/AppEquipmentReqController.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/AppEquipmentReqController.java index 338cf03..ff35f03 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/AppEquipmentReqController.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/AppEquipmentReqController.java @@ -1,6 +1,9 @@ package com.bonus.app.controller; import com.bonus.app.service.IAppEquipmentReqService; +import com.bonus.common.core.constant.BusinessConstants; +import com.bonus.common.core.text.Convert; +import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; @@ -10,6 +13,8 @@ import com.bonus.common.entity.bracelet.vo.EquipmentReqDataVo; import com.bonus.common.entity.bracelet.vo.EquipmentReqVo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -35,10 +40,12 @@ public class AppEquipmentReqController extends BaseController { // @RequiresPermissions("app:equipmentReq:list") @GetMapping("list") @SysLog(title = "设备领用", businessType = OperaType.QUERY,logType = 0,module = "设备领用->设备领用列表",details ="查询设备领用列表") - public TableDataInfo list(AppParamsDto dto) { - startPage(); - List list = service.getEquipmentReqLists(dto); - return getDataTable(list); + public AjaxResult list(AppParamsDto dto) { + Integer pageNum = Convert.toInt(ServletUtils.getParameter(BusinessConstants.PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(BusinessConstants.PAGE_SIZE), 10); + PageHelper.startPage(pageNum, pageSize); + PageInfo pageInfo = service.getEquipmentReqLists(dto); + return AjaxResult.success(pageInfo.getList()); } // @RequiresPermissions("app:equipmentReq:addData") diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IAppEquipmentReqService.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IAppEquipmentReqService.java index f1007b0..54d91b3 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IAppEquipmentReqService.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IAppEquipmentReqService.java @@ -5,6 +5,7 @@ import com.bonus.common.entity.app.AppParamsDto; import com.bonus.common.entity.bracelet.BraceletParamsDto; import com.bonus.common.entity.bracelet.vo.EquipmentReqDataVo; import com.bonus.common.entity.bracelet.vo.EquipmentReqVo; +import com.github.pagehelper.PageInfo; import java.util.List; @@ -24,7 +25,7 @@ public interface IAppEquipmentReqService { * @author cwchen * @date 2024/8/6 16:09 */ - List getEquipmentReqLists(AppParamsDto dto); + PageInfo getEquipmentReqLists(AppParamsDto dto); /** * 设备领用 diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppEquipmentReqServiceImpl.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppEquipmentReqServiceImpl.java index 0e9d26e..9c4fcb6 100644 --- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppEquipmentReqServiceImpl.java +++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/AppEquipmentReqServiceImpl.java @@ -10,6 +10,7 @@ import com.bonus.common.entity.bracelet.BraceletParamsDto; import com.bonus.common.entity.bracelet.vo.EquipmentReqDataVo; import com.bonus.common.entity.bracelet.vo.EquipmentReqVo; import com.bonus.common.security.utils.SecurityUtils; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -35,7 +36,7 @@ public class AppEquipmentReqServiceImpl implements IAppEquipmentReqService { private AppEquipmentReqMapper mapper; @Override - public List getEquipmentReqLists(AppParamsDto dto) { + public PageInfo getEquipmentReqLists(AppParamsDto dto) { List list = new ArrayList<>(); try { list = mapper.getEquipmentReqLists(dto); @@ -45,7 +46,8 @@ public class AppEquipmentReqServiceImpl implements IAppEquipmentReqService { } catch (Exception e) { log.error(e.toString(), e); } - return list; + PageInfo pageInfo = new PageInfo<>(list); + return pageInfo; } @Override diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SelectController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SelectController.java index 5936928..7940aa1 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SelectController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SelectController.java @@ -135,4 +135,16 @@ public class SelectController { public AjaxResult getVoltageLevelByLineStats(SysParamsDto dto) { return service.getVoltageLevelByLineStats(dto); } + + /** + * 根据字典编码获取下拉选 app-使用 + * @param dto + * @return AjaxResult + * @author cwchen + * @date 2024/8/13 10:30 + */ + @GetMapping("/getDicts") + public AjaxResult getDicts(SysParamsDto dto) { + return service.getDicts(dto); + } } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SelectMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SelectMapper.java index ca80782..23cd8d1 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SelectMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SelectMapper.java @@ -99,4 +99,13 @@ public interface SelectMapper { * @date 2024/8/13 10:33 */ List getVoltageLevelByLineStats(SysParamsDto dto); + + /** + * 根据字典编码获取下拉选 + * @param dto + * @return List + * @author cwchen + * @date 2024/8/19 17:27 + */ + List getDicts(SysParamsDto dto); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java index 4ac2c21..7e813b4 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java @@ -92,4 +92,13 @@ public interface ISelectService { * @date 2024/8/13 10:31 */ AjaxResult getVoltageLevelByLineStats(SysParamsDto dto); + + /** + * 根据字典编码获取下拉选 + * @param dto + * @return AjaxResult + * @author cwchen + * @date 2024/8/19 17:27 + */ + AjaxResult getDicts(SysParamsDto dto); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java index 3d6e048..48d361d 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java @@ -135,4 +135,15 @@ public class SelectServiceImpl implements ISelectService { } return AjaxResult.success(list); } + + @Override + public AjaxResult getDicts(SysParamsDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getDicts(dto); + } catch (Exception e) { + log.error(e.toString(),e); + } + return AjaxResult.success(list); + } } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml index b848aec..8ec6213 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml @@ -82,4 +82,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dict_value AS id FROM sys_dict_data WHERE dict_type = #{id} + + \ No newline at end of file