ruoyi
/
cloud-server
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(): 修改SysConfig.list集合

boot3.0
DongZeLiang 2024-12-10 19:59:04 +08:00
parent fa29749b22
commit ccf22d62ec
18 changed files with 116 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java
View File

@ -2,7 +2,8 @@ package com.muyu.common.core.web.controller;
import com.muyu.common.core.utils.DateUtils;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.core.web.page.PageQueryModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
@ -10,7 +11,6 @@ import org.springframework.web.bind.annotation.InitBinder;
import java.beans.PropertyEditorSupport;
import java.util.Date;
import java.util.List;
/**
* web层通用数据处理
@ -34,6 +34,16 @@ public class BaseController {
});
}
/**
* 返回结果集封装
* @param pageQueryModel 查询模型对象
* @return 返回结果集
* @param <T> 数据类型
*/
protected <T> Result<DataPageResp<T>> resultList(PageQueryModel<T> pageQueryModel) {
return Result.success(DataPageResp.of(pageQueryModel));
}
/**
* 返回成功
*/

8
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java → cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/DataPageResp.java
View File

@ -1,11 +1,9 @@
package com.muyu.common.core.web.page;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.poi.ss.formula.functions.T;
import java.io.Serializable;
import java.util.List;
@ -20,7 +18,7 @@ import java.util.List;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TableDataInfo<T> implements Serializable {
public class DataPageResp<T> implements Serializable {
private static final long serialVersionUID = 1L;
/**
@ -33,7 +31,7 @@ public class TableDataInfo<T> implements Serializable {
*/
private List<T> rows;
public static <T> TableDataInfo<T> of(Page<T> list) {
return new TableDataInfo<>(list.getTotal(), list.getRecords());
public static <T> DataPageResp<T> of(PageQueryModel<T> pageQueryModel) {
return new DataPageResp<>(pageQueryModel.getTotal(), pageQueryModel.getDataList());
}
}

39
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageQueryModel.java 100644
View File

@ -0,0 +1,39 @@
package com.muyu.common.core.web.page;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* 分页查询模型
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PageQueryModel<T> {
/**
* 总记录数
*/
private long total;
/**
* 列表数据
*/
private List<T> dataList;
/**
* 构建分页查询模型对象
* @param page 分页对象
* @return 分页模型对象
* @param <T> 入参
*/
public static <T> PageQueryModel<T> of(Page<T> page) {
return new PageQueryModel<>(page.getTotal(), page.getRecords());
}
}

53
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java
View File

@ -1,53 +0,0 @@
package com.muyu.common.core.web.page;
import com.muyu.common.core.text.Convert;
import com.muyu.common.core.utils.ServletUtils;
/**
* 表格数据处理
*
* @author muyu
*/
public class TableSupport {
/**
* 当前记录起始索引
*/
public static final String PAGE_NUM = "pageNum";
/**
* 每页显示记录数
*/
public static final String PAGE_SIZE = "pageSize";
/**
* 排序列
*/
public static final String ORDER_BY_COLUMN = "orderByColumn";
/**
* 排序的方向 "desc" 或者 "asc".
*/
public static final String IS_ASC = "isAsc";
/**
* 分页参数合理化
*/
public static final String REASONABLE = "reasonable";
/**
* 封装分页对象
*/
public static PageReq getPageDomain () {
PageReq pageReq = new PageReq();
pageReq.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1));
pageReq.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10));
pageReq.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
pageReq.setIsAsc(ServletUtils.getParameter(IS_ASC));
pageReq.setReasonable(ServletUtils.getParameterToBool(REASONABLE));
return pageReq;
}
public static PageReq buildPageRequest () {
return getPageDomain();
}
}

16
cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java
View File

@ -3,7 +3,7 @@ package com.muyu.gen.controller;
import com.muyu.common.core.text.Convert;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;
@ -41,10 +41,9 @@ public class GenController extends BaseController {
*/
@RequiresPermissions("tool:gen:list")
@GetMapping("/list")
public Result<TableDataInfo<GenTable>> genList (GenTable genTable) {
startPage();
public Result<DataPageResp<GenTable>> genList (GenTable genTable) {
List<GenTable> list = genTableService.selectGenTableList(genTable);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
/**
@ -68,20 +67,19 @@ public class GenController extends BaseController {
*/
@RequiresPermissions("tool:gen:list")
@GetMapping("/db/list")
public Result<TableDataInfo<GenTable>> dataList (GenTable genTable) {
startPage();
public Result<DataPageResp<GenTable>> dataList (GenTable genTable) {
List<GenTable> list = genTableService.selectDbTableList(genTable);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
/**
* 查询数据表字段列表
*/
@GetMapping(value = "/column/{tableId}")
public Result<TableDataInfo<GenTableColumn>> columnList (Long tableId) {
public Result<DataPageResp<GenTableColumn>> columnList (Long tableId) {
List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
return Result.success(
TableDataInfo.<GenTableColumn>builder()
DataPageResp.<GenTableColumn>builder()
.total(list.size())
.rows(list)
.build()

9
cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm
View File

@ -1,7 +1,7 @@
package ${packageName}.controller;
import java.util.List;
import java.io.IOException;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -21,7 +21,7 @@ import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
#if($table.crud || $table.sub)
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
#elseif($table.tree)
#end
@ -44,11 +44,10 @@ public class ${ClassName}Controller extends BaseController
@RequiresPermissions("${permissionPrefix}:list")
@GetMapping("/list")
#if($table.crud || $table.sub)
public Result<TableDataInfo> list(${ClassName} ${className})
public Result<DataPageResp> list(${ClassName} ${className})
{
startPage();
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
#elseif($table.tree)
public Result list(${ClassName} ${className})

16
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java
View File

@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.core.web.page.PageQueryModel;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;
@ -21,7 +22,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
/**
* 参数配置 信息操作处理
@ -42,18 +42,18 @@ public class SysConfigController extends BaseController {
@RequiresPermissions("system:config:list")
@GetMapping("/list")
@Operation(summary = "查询集合", description = "更新水果信息")
public Result<TableDataInfo<SysConfig>> list (SysConfigListReq sysConfigListReq) {
Page<SysConfig> list = configService.pageQuery(SysConfigPageQueryModel.reqBuild(sysConfigListReq));
return Result.success(TableDataInfo.of(list));
public Result<DataPageResp<SysConfig>> list (SysConfigListReq sysConfigListReq) {
PageQueryModel<SysConfig> pageQueryModel = configService.pageQuery(SysConfigPageQueryModel.reqBuild(sysConfigListReq));
return resultList(pageQueryModel);
}
@Log(title = "参数管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:config:export")
@PostMapping("/export")
public void export (HttpServletResponse response, SysConfig config) {
List<SysConfig> list = configService.pageQuery(config);
public void export (HttpServletResponse response, SysConfigListReq sysConfigListReq) {
PageQueryModel<SysConfig> pageQueryModel = configService.pageQuery(SysConfigPageQueryModel.reqBuild(sysConfigListReq));
ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
util.exportExcel(response, list, "参数数据");
util.exportExcel(response, pageQueryModel.getDataList(), "参数数据");
}
/**

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java
View File

@ -4,7 +4,7 @@ import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;
@ -36,10 +36,9 @@ public class SysDictDataController extends BaseController {
@RequiresPermissions("system:dict:list")
@GetMapping("/list")
public Result<TableDataInfo<SysDictData>> list (SysDictData dictData) {
startPage();
public Result<DataPageResp<SysDictData>> list (SysDictData dictData) {
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
@Log(title = "字典数据", businessType = BusinessType.EXPORT)

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java
View File

@ -3,7 +3,7 @@ package com.muyu.system.controller;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;
@ -30,10 +30,9 @@ public class SysDictTypeController extends BaseController {
@RequiresPermissions("system:dict:list")
@GetMapping("/list")
public Result<TableDataInfo<SysDictType>> list (SysDictType dictType) {
startPage();
public Result<DataPageResp<SysDictType>> list (SysDictType dictType) {
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
@Log(title = "字典类型", businessType = BusinessType.EXPORT)

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java
View File

@ -4,7 +4,7 @@ import com.muyu.common.core.constant.CacheConstants;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.redis.service.RedisService;
@ -34,10 +34,9 @@ public class SysLogininforController extends BaseController {
@RequiresPermissions("system:logininfor:list")
@GetMapping("/list")
public Result<TableDataInfo<SysLogininfor>> list (SysLogininfor logininfor) {
startPage();
public Result<DataPageResp<SysLogininfor>> list (SysLogininfor logininfor) {
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
@Log(title = "登录日志", businessType = BusinessType.EXPORT)

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java
View File

@ -2,7 +2,7 @@ package com.muyu.system.controller;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;
@ -31,10 +31,9 @@ public class SysNoticeController extends BaseController {
*/
@RequiresPermissions("system:notice:list")
@GetMapping("/list")
public Result<TableDataInfo<SysNotice>> list (SysNotice notice) {
startPage();
public Result<DataPageResp<SysNotice>> list (SysNotice notice) {
List<SysNotice> list = noticeService.selectNoticeList(notice);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
/**

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java
View File

@ -3,7 +3,7 @@ package com.muyu.system.controller;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.InnerAuth;
@ -29,10 +29,9 @@ public class SysOperlogController extends BaseController {
@RequiresPermissions("system:operlog:list")
@GetMapping("/list")
public Result<TableDataInfo<SysOperLog>> list (SysOperLog operLog) {
startPage();
public Result<DataPageResp<SysOperLog>> list (SysOperLog operLog) {
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
@Log(title = "操作日志", businessType = BusinessType.EXPORT)

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java
View File

@ -3,7 +3,7 @@ package com.muyu.system.controller;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;
@ -33,10 +33,9 @@ public class SysPostController extends BaseController {
*/
@RequiresPermissions("system:post:list")
@GetMapping("/list")
public Result<TableDataInfo<SysPost>> list (SysPost post) {
startPage();
public Result<DataPageResp<SysPost>> list (SysPost post) {
List<SysPost> list = postService.selectPostList(post);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
@Log(title = "岗位管理", businessType = BusinessType.EXPORT)

17
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java
View File

@ -3,7 +3,7 @@ package com.muyu.system.controller;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.RequiresPermissions;
@ -42,10 +42,9 @@ public class SysRoleController extends BaseController {
@RequiresPermissions("system:role:list")
@GetMapping("/list")
public Result<TableDataInfo<SysRole>> list (SysRole role) {
startPage();
public Result<DataPageResp<SysRole>> list (SysRole role) {
List<SysRole> list = roleService.selectRoleList(role);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
@Log(title = "角色管理", businessType = BusinessType.EXPORT)
@ -151,10 +150,9 @@ public class SysRoleController extends BaseController {
*/
@RequiresPermissions("system:role:list")
@GetMapping("/authUser/allocatedList")
public Result<TableDataInfo<SysUser>> allocatedList (SysUser user) {
startPage();
public Result<DataPageResp<SysUser>> allocatedList (SysUser user) {
List<SysUser> list = userService.selectAllocatedList(user);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
/**
@ -162,10 +160,9 @@ public class SysRoleController extends BaseController {
*/
@RequiresPermissions("system:role:list")
@GetMapping("/authUser/unallocatedList")
public Result<TableDataInfo<SysUser>> unallocatedList (SysUser user) {
startPage();
public Result<DataPageResp<SysUser>> unallocatedList (SysUser user) {
List<SysUser> list = userService.selectUnallocatedList(user);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
/**

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java
View File

@ -4,7 +4,7 @@ import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.InnerAuth;
@ -61,10 +61,9 @@ public class SysUserController extends BaseController {
*/
@RequiresPermissions("system:user:list")
@GetMapping("/list")
public Result<TableDataInfo<SysUser>> list (SysUser user) {
startPage();
public Result<DataPageResp<SysUser>> list (SysUser user) {
List<SysUser> list = userService.selectUserList(user);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
@Log(title = "用户管理", businessType = BusinessType.EXPORT)

6
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java
View File

@ -4,7 +4,7 @@ import com.muyu.common.core.constant.CacheConstants;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.core.web.page.DataPageResp;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.redis.service.RedisService;
@ -36,7 +36,7 @@ public class SysUserOnlineController extends BaseController {
@RequiresPermissions("monitor:online:list")
@GetMapping("/list")
public Result<TableDataInfo<SysUserOnline>> list (String ipaddr, String userName) {
public Result<DataPageResp<SysUserOnline>> list (String ipaddr, String userName) {
Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
for (String key : keys) {
@ -53,7 +53,7 @@ public class SysUserOnlineController extends BaseController {
}
Collections.reverse(userOnlineList);
userOnlineList.removeAll(Collections.singleton(null));
return getDataTable(userOnlineList);
return Result.success(new DataPageResp(0, userOnlineList));
}
/**

3
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java
View File

@ -2,6 +2,7 @@ package com.muyu.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.core.web.page.PageQueryModel;
import com.muyu.system.domain.SysConfig;
import com.muyu.system.domain.model.SysConfigPageQueryModel;
@ -15,7 +16,7 @@ import java.util.List;
public interface SysConfigService extends IService<SysConfig> {
Page<SysConfig> pageQuery (SysConfigPageQueryModel pageQueryModel);
PageQueryModel<SysConfig> pageQuery (SysConfigPageQueryModel pageQueryModel);
/**
* 通过Key进行查询值

29
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.constant.CacheConstants;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.web.page.PageQueryModel;
import com.muyu.common.redis.service.RedisService;
import com.muyu.system.domain.SysConfig;
import com.muyu.system.domain.model.SysConfigPageQueryModel;
@ -32,27 +33,15 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
private RedisService redisService;
@Override
public Page<SysConfig> pageQuery (SysConfigPageQueryModel pageQueryModel) {
public PageQueryModel<SysConfig> pageQuery (SysConfigPageQueryModel pageQueryModel) {
LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(pageQueryModel.getConfigName())){
queryWrapper.like(SysConfig::getConfigName, pageQueryModel.getConfigName());
}
if (StringUtils.isNotEmpty(pageQueryModel.getConfigType())){
queryWrapper.like(SysConfig::getConfigType, pageQueryModel.getConfigType());
}
if (StringUtils.isNotEmpty(pageQueryModel.getConfigKey())){
queryWrapper.like(SysConfig::getConfigKey, pageQueryModel.getConfigKey());
}
Date beginTime = pageQueryModel.getBeginTime();
if (Objects.nonNull(beginTime)){
queryWrapper.gt(SysConfig::getCreateTime, beginTime);
}
Date endTime = pageQueryModel.getEndTime();
if (Objects.nonNull(endTime)){
queryWrapper.lt(SysConfig::getCreateTime, endTime);
}
Page<SysConfig> configPage = this.page(pageQueryModel.buildPage(), queryWrapper);
return configPage;
queryWrapper.like(StringUtils.isNotEmpty(pageQueryModel.getConfigName()),SysConfig::getConfigName, pageQueryModel.getConfigName());
queryWrapper.like(StringUtils.isNotEmpty(pageQueryModel.getConfigType()),SysConfig::getConfigType, pageQueryModel.getConfigType());
queryWrapper.like(StringUtils.isNotEmpty(pageQueryModel.getConfigKey()),SysConfig::getConfigKey, pageQueryModel.getConfigKey());
queryWrapper.gt(Objects.nonNull(pageQueryModel.getBeginTime()),SysConfig::getCreateTime, pageQueryModel.getBeginTime());
queryWrapper.lt(Objects.nonNull(pageQueryModel.getEndTime()),SysConfig::getCreateTime, pageQueryModel.getEndTime());
Page<SysConfig> page = this.page(pageQueryModel.buildPage(), queryWrapper);
return PageQueryModel.of(page);
}
/**