From ccf22d62ec82f4dff03bd895c39702c4fb0706dd Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Tue, 10 Dec 2024 19:59:04 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9SysConfig.list?= =?UTF-8?q?=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/web/controller/BaseController.java | 14 ++++- .../{TableDataInfo.java => DataPageResp.java} | 8 ++- .../common/core/web/page/PageQueryModel.java | 39 ++++++++++++++ .../common/core/web/page/TableSupport.java | 53 ------------------- .../muyu/gen/controller/GenController.java | 16 +++--- .../main/resources/vm/java/controller.java.vm | 9 ++-- .../controller/SysConfigController.java | 18 +++---- .../controller/SysDictDataController.java | 7 ++- .../controller/SysDictTypeController.java | 7 ++- .../controller/SysLogininforController.java | 7 ++- .../controller/SysNoticeController.java | 7 ++- .../controller/SysOperlogController.java | 7 ++- .../system/controller/SysPostController.java | 7 ++- .../system/controller/SysRoleController.java | 17 +++--- .../system/controller/SysUserController.java | 7 ++- .../controller/SysUserOnlineController.java | 6 +-- .../muyu/system/service/SysConfigService.java | 3 +- .../service/impl/SysConfigServiceImpl.java | 29 ++++------ 18 files changed, 116 insertions(+), 145 deletions(-) rename cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/{TableDataInfo.java => DataPageResp.java} (62%) create mode 100644 cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageQueryModel.java delete mode 100644 cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java index 3277f84..f7bebd2 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java @@ -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 数据类型 + */ + protected Result> resultList(PageQueryModel pageQueryModel) { + return Result.success(DataPageResp.of(pageQueryModel)); + } + /** * 返回成功 */ diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/DataPageResp.java similarity index 62% rename from cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java rename to cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/DataPageResp.java index 4092675..f05fe81 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/DataPageResp.java @@ -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 implements Serializable { +public class DataPageResp implements Serializable { private static final long serialVersionUID = 1L; /** @@ -33,7 +31,7 @@ public class TableDataInfo implements Serializable { */ private List rows; - public static TableDataInfo of(Page list) { - return new TableDataInfo<>(list.getTotal(), list.getRecords()); + public static DataPageResp of(PageQueryModel pageQueryModel) { + return new DataPageResp<>(pageQueryModel.getTotal(), pageQueryModel.getDataList()); } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageQueryModel.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageQueryModel.java new file mode 100644 index 0000000..383cc75 --- /dev/null +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageQueryModel.java @@ -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 { + + /** + * 总记录数 + */ + private long total; + + /** + * 列表数据 + */ + private List dataList; + + /** + * 构建分页查询模型对象 + * @param page 分页对象 + * @return 分页模型对象 + * @param 入参 + */ + public static PageQueryModel of(Page page) { + return new PageQueryModel<>(page.getTotal(), page.getRecords()); + } +} diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java deleted file mode 100644 index af514d5..0000000 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java +++ /dev/null @@ -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(); - } -} diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java index 1dfe039..6a83d59 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java @@ -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> genList (GenTable genTable) { - startPage(); + public Result> genList (GenTable genTable) { List 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> dataList (GenTable genTable) { - startPage(); + public Result> dataList (GenTable genTable) { List list = genTableService.selectDbTableList(genTable); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } /** * 查询数据表字段列表 */ @GetMapping(value = "/column/{tableId}") - public Result> columnList (Long tableId) { + public Result> columnList (Long tableId) { List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); return Result.success( - TableDataInfo.builder() + DataPageResp.builder() .total(list.size()) .rows(list) .build() diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm index 1df5be0..537ef9a 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm +++ b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm @@ -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 list(${ClassName} ${className}) + public Result 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}) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java index 1ce6c93..c08bc67 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java @@ -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; /** * 参数配置 信息操作处理 @@ -30,7 +30,7 @@ import java.util.List; */ @RestController @RequestMapping("/config") -@Tag(name = "SysConfigController", description = "系统参数配置") +@Tag(name = "SysConfigController", description = "系统参数配置") public class SysConfigController extends BaseController { @Autowired @@ -42,18 +42,18 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:list") @GetMapping("/list") @Operation(summary = "查询集合", description = "更新水果信息") - public Result> list (SysConfigListReq sysConfigListReq) { - Page list = configService.pageQuery(SysConfigPageQueryModel.reqBuild(sysConfigListReq)); - return Result.success(TableDataInfo.of(list)); + public Result> list (SysConfigListReq sysConfigListReq) { + PageQueryModel 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 list = configService.pageQuery(config); + public void export (HttpServletResponse response, SysConfigListReq sysConfigListReq) { + PageQueryModel pageQueryModel = configService.pageQuery(SysConfigPageQueryModel.reqBuild(sysConfigListReq)); ExcelUtil util = new ExcelUtil(SysConfig.class); - util.exportExcel(response, list, "参数数据"); + util.exportExcel(response, pageQueryModel.getDataList(), "参数数据"); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java index f9862d9..3c634bc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java @@ -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> list (SysDictData dictData) { - startPage(); + public Result> list (SysDictData dictData) { List list = dictDataService.selectDictDataList(dictData); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "字典数据", businessType = BusinessType.EXPORT) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index c4a7b9f..fd98413 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java @@ -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> list (SysDictType dictType) { - startPage(); + public Result> list (SysDictType dictType) { List list = dictTypeService.selectDictTypeList(dictType); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "字典类型", businessType = BusinessType.EXPORT) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index c1e92b7..d4e1b77 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java @@ -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> list (SysLogininfor logininfor) { - startPage(); + public Result> list (SysLogininfor logininfor) { List list = logininforService.selectLogininforList(logininfor); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "登录日志", businessType = BusinessType.EXPORT) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java index e6b9ede..83e0617 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java @@ -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> list (SysNotice notice) { - startPage(); + public Result> list (SysNotice notice) { List list = noticeService.selectNoticeList(notice); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java index bb00d1d..e7d3244 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java @@ -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> list (SysOperLog operLog) { - startPage(); + public Result> list (SysOperLog operLog) { List list = operLogService.selectOperLogList(operLog); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "操作日志", businessType = BusinessType.EXPORT) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java index 79f3f47..ae01c19 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -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> list (SysPost post) { - startPage(); + public Result> list (SysPost post) { List list = postService.selectPostList(post); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "岗位管理", businessType = BusinessType.EXPORT) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java index f8b05ad..adaea36 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -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> list (SysRole role) { - startPage(); + public Result> list (SysRole role) { List 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> allocatedList (SysUser user) { - startPage(); + public Result> allocatedList (SysUser user) { List 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> unallocatedList (SysUser user) { - startPage(); + public Result> unallocatedList (SysUser user) { List list = userService.selectUnallocatedList(user); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index bc0b5fe..2a21776 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -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> list (SysUser user) { - startPage(); + public Result> list (SysUser user) { List list = userService.selectUserList(user); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "用户管理", businessType = BusinessType.EXPORT) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java index 5b78721..36dd19d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java @@ -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> list (String ipaddr, String userName) { + public Result> list (String ipaddr, String userName) { Collection keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*"); List userOnlineList = new ArrayList(); 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)); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java index 6a85d90..1d5880b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -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 { - Page pageQuery (SysConfigPageQueryModel pageQueryModel); + PageQueryModel pageQuery (SysConfigPageQueryModel pageQueryModel); /** * 通过Key进行查询值 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java index 3fd6db7..aa56456 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java @@ -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 pageQuery (SysConfigPageQueryModel pageQueryModel) { + public PageQueryModel pageQuery (SysConfigPageQueryModel pageQueryModel) { LambdaQueryWrapper 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 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 page = this.page(pageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); } /**