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/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java index 3bf1e62..cde5ec6 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -4,11 +4,18 @@ import com.muyu.common.core.constant.UserConstants; 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.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; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; +import com.muyu.system.domain.SysConfig; +import com.muyu.system.domain.model.SysConfigPageQueryModel; +import com.muyu.system.domain.model.SysDeptPageQueryModel; +import com.muyu.system.domain.rep.SysConfigListReq; +import com.muyu.system.domain.rep.SysDeptListReq; import com.muyu.system.service.SysDeptService; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.ArrayUtils; @@ -36,9 +43,9 @@ public class SysDeptController extends BaseController { */ @RequiresPermissions("system:dept:list") @GetMapping("/list") - public Result list (SysDept dept) { - List depts = deptService.selectDeptList(dept); - return success(depts); + public Result> list (SysDeptListReq sysDeptListReq) { + PageQueryModel pageQueryModel = deptService.pageQuery(SysDeptPageQueryModel.reqBuild(sysDeptListReq)); + return resultList(pageQueryModel); } /** 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..8c492b6 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,12 +4,17 @@ 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.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; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDictData; +import com.muyu.common.system.domain.SysDictType; +import com.muyu.system.domain.model.SysDictDataPageQueryModel; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; +import com.muyu.system.domain.rep.SysDictDataListReq; import com.muyu.system.service.SysDictDataService; import com.muyu.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; @@ -36,12 +41,12 @@ public class SysDictDataController extends BaseController { @RequiresPermissions("system:dict:list") @GetMapping("/list") - public Result> list (SysDictData dictData) { - startPage(); - List list = dictDataService.selectDictDataList(dictData); - return getDataTable(list); + public Result> list (SysDictDataListReq sysDictDataListReq) { + PageQueryModel pageQueryModel = dictDataService.pageQuery(SysDictDataPageQueryModel.reqBuild(sysDictDataListReq)); + return resultList(pageQueryModel); } + @Log(title = "字典数据", businessType = BusinessType.EXPORT) @RequiresPermissions("system:dict:export") @PostMapping("/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..c781bdb 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,12 +3,16 @@ 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.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; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDictType; +import com.muyu.system.domain.model.SysDictDataPageQueryModel; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; +import com.muyu.system.domain.rep.SysDictTypeListReq; import com.muyu.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -30,10 +34,9 @@ public class SysDictTypeController extends BaseController { @RequiresPermissions("system:dict:list") @GetMapping("/list") - public Result> list (SysDictType dictType) { - startPage(); - List list = dictTypeService.selectDictTypeList(dictType); - return getDataTable(list); + public Result> list (SysDictTypeListReq sysDictTypeListReq) { + PageQueryModel pageQueryModel = dictTypeService.pageQuery(SysDictTypePageQueryModel.reqBuild(sysDictTypeListReq)); + return resultList(pageQueryModel); } @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..17fd688 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,13 +4,18 @@ 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.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.common.system.domain.SysDictType; import com.muyu.common.system.domain.SysLogininfor; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; +import com.muyu.system.domain.model.SysLogininforPageQueryModel; +import com.muyu.system.domain.rep.SysLogininforListReq; import com.muyu.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,10 +39,9 @@ public class SysLogininforController extends BaseController { @RequiresPermissions("system:logininfor:list") @GetMapping("/list") - public Result> list (SysLogininfor logininfor) { - startPage(); - List list = logininforService.selectLogininforList(logininfor); - return getDataTable(list); + public Result> list (SysLogininforListReq sysLogininforListReq) { + PageQueryModel pageQueryModel = logininforService.pageQuery(SysLogininforPageQueryModel.reqBuild(sysLogininforListReq)); + return resultList(pageQueryModel); } @Log(title = "登录日志", businessType = BusinessType.EXPORT) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index e5ae348..5a78005 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -4,11 +4,17 @@ import com.muyu.common.core.constant.UserConstants; 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.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; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.SysMenu; +import com.muyu.system.domain.model.SysLogininforPageQueryModel; +import com.muyu.system.domain.model.SysMenuPageQueryModel; +import com.muyu.system.domain.rep.SysMenuListReq; import com.muyu.system.domain.resp.RoleMenuTreeResp; import com.muyu.system.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,10 +39,10 @@ public class SysMenuController extends BaseController { */ @RequiresPermissions("system:menu:list") @GetMapping("/list") - public Result list (SysMenu menu) { + public Result> list (SysMenuListReq sysMenuListReq) { Long userId = SecurityUtils.getUserId(); - List menus = menuService.selectMenuList(menu, userId); - return success(menus); + PageQueryModel pageQueryModel = menuService.pageQuery(SysMenuPageQueryModel.reqBuild(sysMenuListReq),userId); + return resultList(pageQueryModel); } /** 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..3a086f9 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,12 +2,17 @@ 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.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; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.system.domain.SysMenu; import com.muyu.system.domain.SysNotice; +import com.muyu.system.domain.model.SysMenuPageQueryModel; +import com.muyu.system.domain.model.SysNoticePageQueryModel; +import com.muyu.system.domain.rep.SysNoticeListReq; import com.muyu.system.service.SysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -31,10 +36,9 @@ public class SysNoticeController extends BaseController { */ @RequiresPermissions("system:notice:list") @GetMapping("/list") - public Result> list (SysNotice notice) { - startPage(); - List list = noticeService.selectNoticeList(notice); - return getDataTable(list); + public Result> list (SysNoticeListReq sysNoticeListReq) { + PageQueryModel pageQueryModel = noticeService.pageQuery(SysNoticePageQueryModel.reqBuild(sysNoticeListReq)); + return resultList(pageQueryModel); } /** 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..885c9fa 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,12 +3,17 @@ 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.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysOperLog; +import com.muyu.system.domain.SysNotice; +import com.muyu.system.domain.model.SysNoticePageQueryModel; +import com.muyu.system.domain.model.SysOperlogPageQueryModel; +import com.muyu.system.domain.rep.SysOperlogListReq; import com.muyu.system.service.SysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,10 +34,9 @@ public class SysOperlogController extends BaseController { @RequiresPermissions("system:operlog:list") @GetMapping("/list") - public Result> list (SysOperLog operLog) { - startPage(); - List list = operLogService.selectOperLogList(operLog); - return getDataTable(list); + public Result> list (SysOperlogListReq sysOperlogListReq) { + PageQueryModel pageQueryModel = operLogService.pageQuery(SysOperlogPageQueryModel.reqBuild(sysOperlogListReq)); + return resultList(pageQueryModel); } @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..ae8bf87 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,12 +3,17 @@ 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.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; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysOperLog; import com.muyu.system.domain.SysPost; +import com.muyu.system.domain.model.SysOperlogPageQueryModel; +import com.muyu.system.domain.model.SysPostPageQueryModel; +import com.muyu.system.domain.rep.SysPostListReq; import com.muyu.system.service.SysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -33,10 +38,9 @@ public class SysPostController extends BaseController { */ @RequiresPermissions("system:post:list") @GetMapping("/list") - public Result> list (SysPost post) { - startPage(); - List list = postService.selectPostList(post); - return getDataTable(list); + public Result> list (SysPostListReq sysPostListReq) { + PageQueryModel pageQueryModel = postService.pageQuery(SysPostPageQueryModel.reqBuild(sysPostListReq)); + return resultList(pageQueryModel); } @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..3abf145 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,8 @@ 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.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; @@ -11,7 +12,11 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; +import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysUserRole; +import com.muyu.system.domain.model.SysPostPageQueryModel; +import com.muyu.system.domain.model.SysRolePageQueryModel; +import com.muyu.system.domain.rep.SysRoleListReq; import com.muyu.system.domain.resp.DeptTreeResp; import com.muyu.system.service.SysDeptService; import com.muyu.system.service.SysRoleService; @@ -42,10 +47,9 @@ public class SysRoleController extends BaseController { @RequiresPermissions("system:role:list") @GetMapping("/list") - public Result> list (SysRole role) { - startPage(); - List list = roleService.selectRoleList(role); - return getDataTable(list); + public Result> list (SysRoleListReq sysRoleListReq) { + PageQueryModel pageQueryModel = roleService.pageQuery(SysRolePageQueryModel.reqBuild(sysRoleListReq)); + return resultList(pageQueryModel); } @Log(title = "角色管理", businessType = BusinessType.EXPORT) @@ -151,10 +155,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 +165,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..32a892d 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,8 @@ 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.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.InnerAuth; @@ -14,6 +15,9 @@ import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; +import com.muyu.system.domain.model.SysRolePageQueryModel; +import com.muyu.system.domain.model.SysUserPageQueryModel; +import com.muyu.system.domain.rep.SysUserListReq; import com.muyu.system.domain.resp.AuthRoleResp; import com.muyu.system.domain.resp.UserDetailInfoResp; import com.muyu.system.domain.resp.UserInfoResp; @@ -61,10 +65,9 @@ public class SysUserController extends BaseController { */ @RequiresPermissions("system:user:list") @GetMapping("/list") - public Result> list (SysUser user) { - startPage(); - List list = userService.selectUserList(user); - return getDataTable(list); + public Result> list (SysUserListReq sysUserListReq) { + PageQueryModel pageQueryModel = userService.pageQuery(SysUserPageQueryModel.reqBuild(sysUserListReq)); + return resultList(pageQueryModel); } @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/domain/model/SysDeptPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java new file mode 100644 index 0000000..260f3a1 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java @@ -0,0 +1,43 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysConfigListReq; +import com.muyu.system.domain.rep.SysDeptListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysDeptPageQueryModel extends QueryModel { + + /** + * 部门名称 + */ + private String deptName; + + /** + * 部门状态:0正常,1停用 + */ + private String status; + + + public static SysDeptPageQueryModel reqBuild(SysDeptListReq sysDeptListReq) { + SysDeptPageQueryModel sysDeptPageQueryModel = SysDeptPageQueryModel.builder() + .deptName(sysDeptListReq.getDeptName()) + .status(sysDeptListReq.getStatus()) + .build(); + sysDeptPageQueryModel.domainBuild(sysDeptListReq); + return sysDeptPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java new file mode 100644 index 0000000..733351b --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java @@ -0,0 +1,46 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysDictDataListReq; +import com.muyu.system.domain.rep.SysDictTypeListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysDictDataPageQueryModel extends QueryModel { + + /** + * 字典类型 + */ + private String dictType; + /** + * 字典标签 + */ + private String dictLabel; + /** + * 状态（0正常 1停用） + */ + private String status; + + public static SysDictDataPageQueryModel reqBuild(SysDictDataListReq sysDictDataListReq) { + SysDictDataPageQueryModel sysDictDataPageQueryModel = SysDictDataPageQueryModel.builder() + .dictType(sysDictDataListReq.getDictType()) + .dictLabel(sysDictDataListReq.getDictLabel()) + .status(sysDictDataListReq.getStatus()) + .build(); + sysDictDataPageQueryModel.domainBuild(sysDictDataListReq); + return sysDictDataPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java new file mode 100644 index 0000000..ab6ae4b --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java @@ -0,0 +1,62 @@ +package com.muyu.system.domain.model; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysDeptListReq; +import com.muyu.system.domain.rep.SysDictTypeListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysDictTypePageQueryModel extends QueryModel { + + /** + * 字典名称 + */ + private String dictName; + + /** + * 字典类型 + */ + private String dictType; + + /** + * 状态（0正常 1停用） + */ + private String status; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; + + public static SysDictTypePageQueryModel reqBuild(SysDictTypeListReq sysDictTypeListReq) { + SysDictTypePageQueryModel sysDictTypePageQueryModel = SysDictTypePageQueryModel.builder() + .dictName(sysDictTypeListReq.getDictName()) + .dictType(sysDictTypeListReq.getDictType()) + .status(sysDictTypeListReq.getStatus()) + .beginTime(sysDictTypeListReq.getBeginTime()) + .endTime(sysDictTypeListReq.getEndTime()) + .build(); + sysDictTypePageQueryModel.domainBuild(sysDictTypeListReq); + return sysDictTypePageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java new file mode 100644 index 0000000..e8f0f5c --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java @@ -0,0 +1,57 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysDictTypeListReq; +import com.muyu.system.domain.rep.SysLogininforListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysLogininforPageQueryModel extends QueryModel { + + /** + * 用户账号 + */ + private String userName; + /** + * 状态 0成功 1失败 + */ + private String status; + /** + * 地址 + */ + private String ipaddr; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; + + public static SysLogininforPageQueryModel reqBuild(SysLogininforListReq sysLogininforListReq) { + SysLogininforPageQueryModel sysLogininforPageQueryModel = SysLogininforPageQueryModel.builder() + .userName(sysLogininforListReq.getUserName()) + .status(sysLogininforListReq.getStatus()) + .ipaddr(sysLogininforListReq.getIpaddr()) + .beginTime(sysLogininforListReq.getBeginTime()) + .endTime(sysLogininforListReq.getEndTime()) + .build(); + sysLogininforPageQueryModel.domainBuild(sysLogininforListReq); + return sysLogininforPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java new file mode 100644 index 0000000..ce4410c --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java @@ -0,0 +1,39 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysLogininforListReq; +import com.muyu.system.domain.rep.SysMenuListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysMenuPageQueryModel extends QueryModel { + /** + * 菜单名称 + */ + private String menuName; + /** + * 菜单状态（0正常 1停用） + */ + private String status; + + public static SysMenuPageQueryModel reqBuild(SysMenuListReq sysMenuListReq) { + SysMenuPageQueryModel sysMenuPageQueryModel = SysMenuPageQueryModel.builder() + .menuName(sysMenuListReq.getMenuName()) + .status(sysMenuListReq.getStatus()) + .build(); + sysMenuPageQueryModel.domainBuild(sysMenuListReq); + return sysMenuPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java new file mode 100644 index 0000000..7038148 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java @@ -0,0 +1,45 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysMenuListReq; +import com.muyu.system.domain.rep.SysNoticeListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysNoticePageQueryModel extends QueryModel { + /** + * 公告标题 + */ + private String noticeTitle; + + /** + * 公告类型（1通知 2公告） + */ + private String noticeType; + /** + * 创建者 + */ + private String createBy; + + public static SysNoticePageQueryModel reqBuild(SysNoticeListReq sysNoticeListReq) { + SysNoticePageQueryModel sysNoticePageQueryModel = SysNoticePageQueryModel.builder() + .noticeTitle(sysNoticeListReq.getNoticeTitle()) + .noticeType(sysNoticeListReq.getNoticeType()) + .createBy(sysNoticeListReq.getCreateBy()) + .build(); + sysNoticePageQueryModel.domainBuild(sysNoticeListReq); + return sysNoticePageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java new file mode 100644 index 0000000..a87b94d --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java @@ -0,0 +1,66 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysNoticeListReq; +import com.muyu.system.domain.rep.SysOperlogListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + + +/** + * 参数配置 分页 模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysOperlogPageQueryModel extends QueryModel { + /** + * 操作地址 + */ + private String operIp; + /** + * 操作模块 + */ + private String title; + /** + * 操作人员 + */ + private String operName; + /** + * 业务类型（0其它 1新增 2修改 3删除） + */ + private Integer businessType; + /** + * 操作状态（0正常 1异常） + */ + private Integer status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; + + public static SysOperlogPageQueryModel reqBuild(SysOperlogListReq sysOperlogListReq) { + SysOperlogPageQueryModel sysOperlogPageQueryModel = SysOperlogPageQueryModel.builder() + .operIp(sysOperlogListReq.getOperIp()) + .title(sysOperlogListReq.getTitle()) + .operName(sysOperlogListReq.getOperName()) + .businessType(sysOperlogListReq.getBusinessType()) + .status(sysOperlogListReq.getStatus()) + .beginTime(sysOperlogListReq.getBeginTime()) + .endTime(sysOperlogListReq.getEndTime()) + .build(); + sysOperlogPageQueryModel.domainBuild(sysOperlogListReq); + return sysOperlogPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java new file mode 100644 index 0000000..44339d4 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java @@ -0,0 +1,47 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysOperlogListReq; +import com.muyu.system.domain.rep.SysPostListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysPostPageQueryModel extends QueryModel { + /** + * 岗位编码 + */ + private String postCode; + + /** + * 岗位名称 + */ + private String postName; + + /** + * 状态（0正常 1停用） + */ + private String status; + + public static SysPostPageQueryModel reqBuild(SysPostListReq sysPostListReq) { + SysPostPageQueryModel sysPostPageQueryModel = SysPostPageQueryModel.builder() + .postCode(sysPostListReq.getPostCode()) + .postName(sysPostListReq.getPostName()) + .status(sysPostListReq.getStatus()) + .build(); + sysPostPageQueryModel.domainBuild(sysPostListReq); + return sysPostPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java new file mode 100644 index 0000000..1604b04 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java @@ -0,0 +1,65 @@ +package com.muyu.system.domain.model; + +/** + * @ClassName SysRolePageQueryModel + * @Author AnNan.Wang + * @Date 2024/12/16 12:34 + */ + + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysPostListReq; +import com.muyu.system.domain.rep.SysRoleListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysRolePageQueryModel extends QueryModel { + /** + * 角色名称 + */ + private String roleName; + + /** + * 角色权限 + */ + private String roleKey; + /** + * 角色状态（0正常 1停用） + */ + private String status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; + + + public static SysRolePageQueryModel reqBuild(SysRoleListReq sysRoleListReq) { + SysRolePageQueryModel sysRolePageQueryModel = SysRolePageQueryModel.builder() + .roleName(sysRoleListReq.getRoleName()) + .roleKey(sysRoleListReq.getRoleKey()) + .status(sysRoleListReq.getStatus()) + .beginTime(sysRoleListReq.getBeginTime()) + .endTime(sysRoleListReq.getEndTime()) + .build(); + sysRolePageQueryModel.domainBuild(sysRoleListReq); + return sysRolePageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java new file mode 100644 index 0000000..b8e8417 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java @@ -0,0 +1,58 @@ +package com.muyu.system.domain.model; + + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysPostListReq; +import com.muyu.system.domain.rep.SysUserListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysUserPageQueryModel extends QueryModel { + + /** + * 用户昵称 + */ + private String nickName; + /** + * 手机号码 + */ + private String phonenumber; + /** + * 帐号状态（0正常 1停用） + */ + private String status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; + + public static SysUserPageQueryModel reqBuild(SysUserListReq sysUserListReq) { + SysUserPageQueryModel sysUserPageQueryModel = SysUserPageQueryModel.builder() + .nickName(sysUserListReq.getNickName()) + .phonenumber(sysUserListReq.getPhonenumber()) + .status(sysUserListReq.getStatus()) + .beginTime(sysUserListReq.getBeginTime()) + .endTime(sysUserListReq.getEndTime()) + .build(); + sysUserPageQueryModel.domainBuild(sysUserListReq); + return sysUserPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptListReq.java new file mode 100644 index 0000000..48687cc --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptListReq.java @@ -0,0 +1,34 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 部门信息请求列表查询对象 + * + * @ClassName SysDeptListReq + * @Author AnNan.Wang + * @Date 2024/12/14 11:44 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysDeptListReq extends PageReq { + + /** + * 部门名称 + */ + private String deptName; + + /** + * 部门状态:0正常,1停用 + */ + private String status; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataListReq.java new file mode 100644 index 0000000..5e44bbe --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataListReq.java @@ -0,0 +1,37 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 数据字典信息 + * + * @ClassName SysDictDataListReq + * @Author AnNan.Wang + * @Date 2024/12/15 17:29 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysDictDataListReq extends PageReq { + + /** + * 字典名称 + */ + private String dictType; + /** + * 字典标签 + */ + private String dictLabel; + /** + * 状态（0正常 1停用） + */ + private String status; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java new file mode 100644 index 0000000..886216a --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java @@ -0,0 +1,51 @@ +package com.muyu.system.domain.rep; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 字典数据表 请求列表查询对象 + * + * @author muyu + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysDictTypeListReq extends PageReq { + + /** + * 字典名称 + */ + private String dictName; + + /** + * 字典类型 + */ + private String dictType; + + /** + * 状态（0正常 1停用） + */ + private String status; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java new file mode 100644 index 0000000..39032c3 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java @@ -0,0 +1,46 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 系统访问记录请求列表查询对象 + * + * @ClassName SysLogininforListReq + * @Author AnNan.Wang + * @Date 2024/12/16 10:23 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysLogininforListReq extends PageReq { + /** + * 用户账号 + */ + private String userName; + /** + * 状态 0成功 1失败 + */ + private String status; + /** + * 地址 + */ + private String ipaddr; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuListReq.java new file mode 100644 index 0000000..7cf9817 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuListReq.java @@ -0,0 +1,32 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 菜单信息请求列表查询对象 + * + * @ClassName SysMenuListReq + * @Author AnNan.Wang + * @Date 2024/12/16 10:55 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysMenuListReq extends PageReq { + /** + * 菜单名称 + */ + private String menuName; + /** + * 菜单状态（0正常 1停用） + */ + private String status; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeListReq.java new file mode 100644 index 0000000..790c44f --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeListReq.java @@ -0,0 +1,37 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 公告信息操作处理请求列表查询对象 + * + * @ClassName SysNoticeListReq + * @Author AnNan.Wang + * @Date 2024/12/16 11:02 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysNoticeListReq extends PageReq { + /** + * 公告标题 + */ + private String noticeTitle; + + /** + * 公告类型（1通知 2公告） + */ + private String noticeType; + /** + * 创建者 + */ + private String createBy; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysOperlogListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysOperlogListReq.java new file mode 100644 index 0000000..70cc11d --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysOperlogListReq.java @@ -0,0 +1,54 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 操作日志记录请求列表查询对象 + * + * @ClassName SysOperlogListReq + * @Author AnNan.Wang + * @Date 2024/12/16 11:18 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysOperlogListReq extends PageReq { + /** + * 操作地址 + */ + private String operIp; + /** + * 操作模块 + */ + private String title; + /** + * 操作人员 + */ + private String operName; + /** + * 业务类型（0其它 1新增 2修改 3删除） + */ + private Integer businessType; + /** + * 操作状态（0正常 1异常） + */ + private Integer status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java new file mode 100644 index 0000000..3ad620e --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java @@ -0,0 +1,40 @@ +package com.muyu.system.domain.rep; + +/** + * @ClassName SysPostListReq + * @Author AnNan.Wang + * @Date 2024/12/16 11:32 + */ + +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 岗位信息操作处理 请求列表查询对象 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysPostListReq extends PageReq { + /** + * 岗位编码 + */ + private String postCode; + + /** + * 岗位名称 + */ + private String postName; + + /** + * 状态（0正常 1停用） + */ + private String status; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java new file mode 100644 index 0000000..4d90125 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java @@ -0,0 +1,44 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 角色信息 请求列表查询对象 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysRoleListReq extends PageReq { + /** + * 角色名称 + */ + private String roleName; + + /** + * 角色权限 + */ + private String roleKey; + /** + * 角色状态（0正常 1停用） + */ + private String status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java new file mode 100644 index 0000000..db9480f --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java @@ -0,0 +1,48 @@ +package com.muyu.system.domain.rep; + +/** + * @ClassName SysUserListReq + * @Author AnNan.Wang + * @Date 2024/12/16 12:30 + */ + +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 用户信息 请求列表查询对象 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysUserListReq extends PageReq { + /** + * 用户昵称 + */ + private String nickName; + /** + * 手机号码 + */ + private String phonenumber; + /** + * 帐号状态（0正常 1停用） + */ + private String status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; +} 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/SysDeptService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java index 140cf91..aae0ce7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java @@ -1,7 +1,11 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysDept; +import com.muyu.system.domain.SysConfig; +import com.muyu.system.domain.model.SysConfigPageQueryModel; +import com.muyu.system.domain.model.SysDeptPageQueryModel; import com.muyu.system.domain.vo.TreeSelect; import java.util.List; @@ -135,4 +139,6 @@ public interface SysDeptService extends IService { * @return 结果 */ public int deleteDeptById (Long deptId); + + PageQueryModel pageQuery(SysDeptPageQueryModel sysDeptPageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java index 47aae4b..0d9e8f5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java @@ -1,7 +1,11 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysDictData; +import com.muyu.common.system.domain.SysDictType; +import com.muyu.system.domain.model.SysDictDataPageQueryModel; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; import java.util.List; @@ -63,4 +67,7 @@ public interface SysDictDataService extends IService { * @return 结果 */ public int updateDictData (SysDictData dictData); + + PageQueryModel pageQuery(SysDictDataPageQueryModel sysDictDataPageQueryModel); + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java index 1b3212d..521251e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java @@ -1,8 +1,10 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysDictData; import com.muyu.common.system.domain.SysDictType; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; import java.util.List; @@ -103,4 +105,7 @@ public interface SysDictTypeService extends IService { * @return 结果 */ public boolean checkDictTypeUnique (SysDictType dictType); + + + PageQueryModel pageQuery(SysDictTypePageQueryModel sysDictTypePageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java index bb3031e..fba80ce 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java @@ -1,7 +1,9 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysLogininfor; +import com.muyu.system.domain.model.SysLogininforPageQueryModel; import java.util.List; @@ -40,4 +42,6 @@ public interface SysLogininforService extends IService { * 清空系统登录日志 */ public void cleanLogininfor (); + + PageQueryModel pageQuery(SysLogininforPageQueryModel sysLogininforPageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java index 29bfb07..5c523dc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java @@ -1,7 +1,11 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.SysMenu; +import com.muyu.system.domain.model.SysLogininforPageQueryModel; +import com.muyu.system.domain.model.SysMenuPageQueryModel; import com.muyu.system.domain.vo.RouterVo; import com.muyu.system.domain.vo.TreeSelect; @@ -158,4 +162,7 @@ public interface SysMenuService extends IService { * @return 结果 */ public boolean checkMenuNameUnique (SysMenu menu); + + PageQueryModel pageQuery(SysMenuPageQueryModel sysMenuPageQueryModel, Long userId); + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java index a1afe02..ec3014e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java @@ -1,7 +1,9 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysNotice; +import com.muyu.system.domain.model.SysNoticePageQueryModel; import java.util.List; @@ -64,4 +66,6 @@ public interface SysNoticeService extends IService { * @return 结果 */ public int deleteNoticeByIds (Long[] noticeIds); + + PageQueryModel pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java index 70b63ee..44fda25 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java @@ -1,7 +1,9 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysOperLog; +import com.muyu.system.domain.model.SysOperlogPageQueryModel; import java.util.List; @@ -51,4 +53,7 @@ public interface SysOperLogService extends IService { * 清空操作日志 */ public void cleanOperLog (); + + PageQueryModel pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel); + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java index fbd8677..3929549 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java @@ -1,7 +1,9 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysPost; +import com.muyu.system.domain.model.SysPostPageQueryModel; import java.util.List; @@ -107,4 +109,7 @@ public interface SysPostService extends IService { * @return 结果 */ public int updatePost (SysPost post); + + PageQueryModel pageQuery(SysPostPageQueryModel sysPostPageQueryModel); + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java index c82eb67..1647adc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java @@ -1,8 +1,10 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysRole; import com.muyu.system.domain.SysUserRole; +import com.muyu.system.domain.model.SysRolePageQueryModel; import java.util.List; import java.util.Set; @@ -186,4 +188,6 @@ public interface SysRoleService extends IService { * @return 结果 */ public int insertAuthUsers (Long roleId, Long[] userIds); + + PageQueryModel pageQuery(SysRolePageQueryModel sysRolePageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java index f4c6167..371a1d1 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java @@ -1,7 +1,9 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysUser; +import com.muyu.system.domain.model.SysUserPageQueryModel; import java.util.List; @@ -225,4 +227,6 @@ public interface SysUserService extends IService { * @return 结果 */ public String importUser (List userList, Boolean isUpdateSupport, String operName); + + PageQueryModel pageQuery(SysUserPageQueryModel sysUserPageQueryModel); } 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); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java index 4ed94c1..40bb9a5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java @@ -1,16 +1,21 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.text.Convert; import com.muyu.common.core.utils.SpringUtils; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.datascope.annotation.DataScope; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; +import com.muyu.system.domain.SysConfig; +import com.muyu.system.domain.model.SysDeptPageQueryModel; import com.muyu.system.domain.vo.TreeSelect; import com.muyu.system.mapper.SysDeptMapper; import com.muyu.system.mapper.SysRoleMapper; @@ -21,6 +26,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -38,6 +44,16 @@ public class SysDeptServiceImpl extends ServiceImpl private SysRoleMapper roleMapper; + @Override + public PageQueryModel pageQuery(SysDeptPageQueryModel sysDeptPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysDeptPageQueryModel.getDeptName()),SysDept::getDeptName, sysDeptPageQueryModel.getDeptName()); + queryWrapper.eq(StringUtils.isNotEmpty(sysDeptPageQueryModel.getStatus()),SysDept::getStatus,sysDeptPageQueryModel.getStatus()); + Page page = this.page(sysDeptPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } + + /** * 查询部门管理数据 * @@ -282,6 +298,8 @@ public class SysDeptServiceImpl extends ServiceImpl return deptMapper.deleteDeptById(deptId); } + + /** * 递归列表 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java index 777ffbd..90b7b8d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java @@ -1,14 +1,22 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.security.utils.DictUtils; import com.muyu.common.system.domain.SysDictData; +import com.muyu.common.system.domain.SysDictType; +import com.muyu.system.domain.model.SysDictDataPageQueryModel; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; import com.muyu.system.mapper.SysDictDataMapper; import com.muyu.system.service.SysDictDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 字典 业务层处理 @@ -20,6 +28,8 @@ public class SysDictDataServiceImpl extends ServiceImpl pageQuery(SysDictDataPageQueryModel sysDictdataPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotEmpty(sysDictdataPageQueryModel.getDictType()),SysDictData::getDictType, sysDictdataPageQueryModel.getDictType()); + queryWrapper.like(StringUtils.isNotEmpty(sysDictdataPageQueryModel.getDictLabel()),SysDictData::getDictLabel, sysDictdataPageQueryModel.getDictLabel()); + queryWrapper.eq(StringUtils.isNotEmpty(sysDictdataPageQueryModel.getStatus()),SysDictData::getDictType, sysDictdataPageQueryModel.getStatus()); + Page page = this.page(sysDictdataPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java index 4117411..5dacdbd 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java @@ -1,12 +1,16 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.security.utils.DictUtils; import com.muyu.common.system.domain.SysDictData; import com.muyu.common.system.domain.SysDictType; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; import com.muyu.system.mapper.SysDictDataMapper; import com.muyu.system.mapper.SysDictTypeMapper; import com.muyu.system.service.SysDictTypeService; @@ -18,6 +22,7 @@ import javax.annotation.PostConstruct; import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -33,6 +38,18 @@ public class SysDictTypeServiceImpl extends ServiceImpl pageQuery(SysDictTypePageQueryModel sysDictDataPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysDictDataPageQueryModel.getDictName()),SysDictType::getDictName, sysDictDataPageQueryModel.getDictName()); + queryWrapper.like(StringUtils.isNotEmpty(sysDictDataPageQueryModel.getDictType()),SysDictType::getDictType, sysDictDataPageQueryModel.getDictType()); + queryWrapper.eq(StringUtils.isNotEmpty(sysDictDataPageQueryModel.getStatus()),SysDictType::getDictType, sysDictDataPageQueryModel.getStatus()); + queryWrapper.gt(Objects.nonNull(sysDictDataPageQueryModel.getBeginTime()),SysDictType::getCreateTime, sysDictDataPageQueryModel.getBeginTime()); + queryWrapper.lt(Objects.nonNull(sysDictDataPageQueryModel.getEndTime()),SysDictType::getCreateTime, sysDictDataPageQueryModel.getEndTime()); + Page page = this.page(sysDictDataPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } + /** * 项目启动时，初始化字典到缓存 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java index 1a7c7a0..935bb65 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java @@ -1,13 +1,20 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; +import com.muyu.common.system.domain.SysDictType; import com.muyu.common.system.domain.SysLogininfor; +import com.muyu.system.domain.model.SysLogininforPageQueryModel; import com.muyu.system.mapper.SysLogininforMapper; import com.muyu.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 系统访问日志情况信息 服务层处理 @@ -61,4 +68,17 @@ public class SysLogininforServiceImpl extends ServiceImpl pageQuery (SysLogininforPageQueryModel sysLogininforPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysLogininforPageQueryModel.getUserName()),SysLogininfor::getUserName, sysLogininforPageQueryModel.getUserName()); + queryWrapper.like(StringUtils.isNotEmpty(sysLogininforPageQueryModel.getIpaddr()),SysLogininfor::getIpaddr, sysLogininforPageQueryModel.getIpaddr()); + queryWrapper.eq(StringUtils.isNotEmpty(sysLogininforPageQueryModel.getStatus()),SysLogininfor::getStatus, sysLogininforPageQueryModel.getStatus()); + queryWrapper.gt(Objects.nonNull(sysLogininforPageQueryModel.getBeginTime()),SysLogininfor::getAccessTime, sysLogininforPageQueryModel.getBeginTime()); + queryWrapper.lt(Objects.nonNull(sysLogininforPageQueryModel.getEndTime()),SysLogininfor::getAccessTime, sysLogininforPageQueryModel.getEndTime()); + Page page = this.page(sysLogininforPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index d23ecdb..e3554da 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -1,13 +1,18 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysMenu; +import com.muyu.system.domain.model.SysMenuPageQueryModel; import com.muyu.system.domain.vo.MetaVo; import com.muyu.system.domain.vo.RouterVo; import com.muyu.system.domain.vo.TreeSelect; @@ -70,6 +75,23 @@ public class SysMenuServiceImpl extends ServiceImpl impl } return menuList; } + @Override + public PageQueryModel pageQuery(SysMenuPageQueryModel sysMenuPageQueryModel, Long userId) { + Page page = null; + // 管理员显示所有菜单信息 + if (SysUser.isAdmin(userId)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysMenuPageQueryModel.getMenuName()),SysMenu::getMenuName, sysMenuPageQueryModel.getMenuName()); + queryWrapper.eq(StringUtils.isNotEmpty(sysMenuPageQueryModel.getStatus()),SysMenu::getStatus, sysMenuPageQueryModel.getStatus()); + page = this.page(sysMenuPageQueryModel.buildPage(), queryWrapper); + } else { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysMenuPageQueryModel.getMenuName()),SysMenu::getMenuName, sysMenuPageQueryModel.getMenuName()); + queryWrapper.eq(StringUtils.isNotEmpty(sysMenuPageQueryModel.getStatus()),SysMenu::getStatus, sysMenuPageQueryModel.getStatus()); + page = this.page(sysMenuPageQueryModel.buildPage(), queryWrapper); + } + return PageQueryModel.of(page); + } /** * 根据用户ID查询权限 @@ -335,6 +357,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl return UserConstants.UNIQUE; } + + /** * 获取路由名称 * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java index 8c0c8d5..2facb8a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java @@ -1,13 +1,20 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.SysNotice; +import com.muyu.system.domain.model.SysNoticePageQueryModel; import com.muyu.system.mapper.SysNoticeMapper; import com.muyu.system.service.SysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 公告 服务层实现 @@ -19,6 +26,7 @@ public class SysNoticeServiceImpl extends ServiceImpl pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysNoticePageQueryModel.getNoticeTitle()),SysNotice::getNoticeTitle, sysNoticePageQueryModel.getNoticeTitle()); + queryWrapper.eq(StringUtils.isNotEmpty(sysNoticePageQueryModel.getNoticeType()),SysNotice::getNoticeType, sysNoticePageQueryModel.getNoticeType()); + queryWrapper.like(StringUtils.isNotEmpty(sysNoticePageQueryModel.getCreateBy()),SysNotice::getCreateBy, sysNoticePageQueryModel.getCreateBy()); + Page page = this.page(sysNoticePageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java index 24e7d39..d924b22 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java @@ -1,13 +1,20 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.common.system.domain.SysOperLog; +import com.muyu.system.domain.model.SysOperlogPageQueryModel; import com.muyu.system.mapper.SysOperLogMapper; import com.muyu.system.service.SysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 操作日志 服务层处理 @@ -74,4 +81,18 @@ public class SysOperLogServiceImpl extends ServiceImpl pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysOperlogPageQueryModel.getOperIp()),SysOperLog::getOperIp, sysOperlogPageQueryModel.getOperIp()); + queryWrapper.like(StringUtils.isNotEmpty(sysOperlogPageQueryModel.getTitle()),SysOperLog::getTitle, sysOperlogPageQueryModel.getTitle()); + queryWrapper.like(StringUtils.isNotEmpty(sysOperlogPageQueryModel.getOperName()),SysOperLog::getOperName, sysOperlogPageQueryModel.getOperName()); + queryWrapper.eq(Objects.nonNull(sysOperlogPageQueryModel.getBusinessType()),SysOperLog::getBusinessType, sysOperlogPageQueryModel.getBusinessType()); + queryWrapper.eq(Objects.nonNull(sysOperlogPageQueryModel.getStatus()),SysOperLog::getStatus, sysOperlogPageQueryModel.getStatus()); + queryWrapper.gt(Objects.nonNull(sysOperlogPageQueryModel.getBeginTime()),SysOperLog::getOperTime, sysOperlogPageQueryModel.getBeginTime()); + queryWrapper.lt(Objects.nonNull(sysOperlogPageQueryModel.getEndTime()),SysOperLog::getOperTime, sysOperlogPageQueryModel.getEndTime()); + Page page = this.page(sysOperlogPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java index 457ac5a..341d45a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java @@ -1,10 +1,15 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.SysPost; +import com.muyu.system.domain.model.SysPostPageQueryModel; import com.muyu.system.mapper.SysPostMapper; import com.muyu.system.mapper.SysUserPostMapper; import com.muyu.system.service.SysPostService; @@ -12,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 岗位信息 服务层处理 @@ -171,4 +177,14 @@ public class SysPostServiceImpl extends ServiceImpl impl public int updatePost (SysPost post) { return postMapper.updatePost(post); } + + @Override + public PageQueryModel pageQuery(SysPostPageQueryModel sysPostPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysPostPageQueryModel.getPostCode()),SysPost::getPostCode, sysPostPageQueryModel.getPostCode()); + queryWrapper.like(StringUtils.isNotEmpty(sysPostPageQueryModel.getPostName()),SysPost::getPostName, sysPostPageQueryModel.getPostName()); + queryWrapper.eq(StringUtils.isNotEmpty(sysPostPageQueryModel.getStatus()),SysPost::getStatus, sysPostPageQueryModel.getStatus()); + Page page = this.page(sysPostPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java index 2a15bb3..d5bf96e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java @@ -2,18 +2,22 @@ package com.muyu.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.SpringUtils; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.datascope.annotation.DataScope; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysOperLog; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysRoleDept; import com.muyu.system.domain.SysRoleMenu; import com.muyu.system.domain.SysUserRole; +import com.muyu.system.domain.model.SysRolePageQueryModel; import com.muyu.system.mapper.SysRoleDeptMapper; import com.muyu.system.mapper.SysRoleMapper; import com.muyu.system.mapper.SysRoleMenuMapper; @@ -439,4 +443,18 @@ public class SysRoleServiceImpl extends ServiceImpl impl } return userRoleMapper.batchUserRole(list); } + + @Override + public PageQueryModel pageQuery(SysRolePageQueryModel sysRolePageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysRolePageQueryModel.getRoleName()),SysRole::getRoleName, sysRolePageQueryModel.getRoleName()); + queryWrapper.like(StringUtils.isNotEmpty(sysRolePageQueryModel.getRoleKey()),SysRole::getRoleKey, sysRolePageQueryModel.getRoleKey()); + queryWrapper.eq(Objects.nonNull(sysRolePageQueryModel.getStatus()),SysRole::getStatus, sysRolePageQueryModel.getStatus()); + queryWrapper.gt(Objects.nonNull(sysRolePageQueryModel.getBeginTime()),SysRole::getCreateTime, sysRolePageQueryModel.getBeginTime()); + queryWrapper.lt(Objects.nonNull(sysRolePageQueryModel.getEndTime()),SysRole::getCreateTime, sysRolePageQueryModel.getEndTime()); + Page page = this.page(sysRolePageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } + + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index c1d3f18..8e8a52d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -1,11 +1,14 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.SpringUtils; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.bean.BeanValidators; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.datascope.annotation.DataScope; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysRole; @@ -13,6 +16,7 @@ import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysUserPost; import com.muyu.system.domain.SysUserRole; +import com.muyu.system.domain.model.SysUserPageQueryModel; import com.muyu.system.mapper.*; import com.muyu.system.service.SysUserService; import com.muyu.system.service.SysConfigService; @@ -26,6 +30,7 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -500,4 +505,20 @@ public class SysUserServiceImpl extends ServiceImpl impl return successMsg.toString(); } + @Override + public PageQueryModel pageQuery(SysUserPageQueryModel sysUserPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysUserPageQueryModel.getPhonenumber()),SysUser::getPhonenumber, sysUserPageQueryModel.getPhonenumber()); + queryWrapper.eq(StringUtils.isNotEmpty(sysUserPageQueryModel.getNickName()),SysUser::getNickName, sysUserPageQueryModel.getNickName()); + queryWrapper.eq(Objects.nonNull(sysUserPageQueryModel.getStatus()),SysUser::getStatus, sysUserPageQueryModel.getStatus()); + queryWrapper.gt(Objects.nonNull(sysUserPageQueryModel.getBeginTime()),SysUser::getCreateTime, sysUserPageQueryModel.getBeginTime()); + queryWrapper.lt(Objects.nonNull(sysUserPageQueryModel.getEndTime()),SysUser::getCreateTime, sysUserPageQueryModel.getEndTime()); + Page page = this.page(sysUserPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } + //nickName + //phonenumber + //status + //beginTime + //endTime }