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

fix():修改list集合

detached
wangannan 2024-12-10 19:59:04 +08:00 committed by cbg_wangannan
parent fa29749b22
commit c01d279664
60 changed files with 1377 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

13
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
View File

@ -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<SysDept> depts = deptService.selectDeptList(dept);
return success(depts);
public Result<DataPageResp<SysDept>> list (SysDeptListReq sysDeptListReq) {
PageQueryModel<SysDept> pageQueryModel = deptService.pageQuery(SysDeptPageQueryModel.reqBuild(sysDeptListReq));
return resultList(pageQueryModel);
}
/**

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

@ -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<TableDataInfo<SysDictData>> list (SysDictData dictData) {
startPage();
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
return getDataTable(list);
public Result<DataPageResp<SysDictData>> list (SysDictDataListReq sysDictDataListReq) {
PageQueryModel<SysDictData> pageQueryModel = dictDataService.pageQuery(SysDictDataPageQueryModel.reqBuild(sysDictDataListReq));
return resultList(pageQueryModel);
}
@Log(title = "字典数据", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:dict:export")
@PostMapping("/export")

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

@ -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<TableDataInfo<SysDictType>> list (SysDictType dictType) {
startPage();
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
return getDataTable(list);
public Result<DataPageResp<SysDictType>> list (SysDictTypeListReq sysDictTypeListReq) {
PageQueryModel<SysDictType> pageQueryModel = dictTypeService.pageQuery(SysDictTypePageQueryModel.reqBuild(sysDictTypeListReq));
return resultList(pageQueryModel);
}
@Log(title = "字典类型", businessType = BusinessType.EXPORT)

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

@ -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<TableDataInfo<SysLogininfor>> list (SysLogininfor logininfor) {
startPage();
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
return getDataTable(list);
public Result<DataPageResp<SysLogininfor>> list (SysLogininforListReq sysLogininforListReq) {
PageQueryModel<SysLogininfor> pageQueryModel = logininforService.pageQuery(SysLogininforPageQueryModel.reqBuild(sysLogininforListReq));
return resultList(pageQueryModel);
}
@Log(title = "登录日志", businessType = BusinessType.EXPORT)

12
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java
View File

@ -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<DataPageResp<SysMenu>> list (SysMenuListReq sysMenuListReq) {
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuList(menu, userId);
return success(menus);
PageQueryModel<SysMenu> pageQueryModel = menuService.pageQuery(SysMenuPageQueryModel.reqBuild(sysMenuListReq),userId);
return resultList(pageQueryModel);
}
/**

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

@ -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<TableDataInfo<SysNotice>> list (SysNotice notice) {
startPage();
List<SysNotice> list = noticeService.selectNoticeList(notice);
return getDataTable(list);
public Result<DataPageResp<SysNotice>> list (SysNoticeListReq sysNoticeListReq) {
PageQueryModel<SysNotice> pageQueryModel = noticeService.pageQuery(SysNoticePageQueryModel.reqBuild(sysNoticeListReq));
return resultList(pageQueryModel);
}
/**

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

@ -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<TableDataInfo<SysOperLog>> list (SysOperLog operLog) {
startPage();
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
return getDataTable(list);
public Result<DataPageResp<SysOperLog>> list (SysOperlogListReq sysOperlogListReq) {
PageQueryModel<SysOperLog> pageQueryModel = operLogService.pageQuery(SysOperlogPageQueryModel.reqBuild(sysOperlogListReq));
return resultList(pageQueryModel);
}
@Log(title = "操作日志", businessType = BusinessType.EXPORT)

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

@ -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<TableDataInfo<SysPost>> list (SysPost post) {
startPage();
List<SysPost> list = postService.selectPostList(post);
return getDataTable(list);
public Result<DataPageResp<SysPost>> list (SysPostListReq sysPostListReq) {
PageQueryModel<SysPost> pageQueryModel = postService.pageQuery(SysPostPageQueryModel.reqBuild(sysPostListReq));
return resultList(pageQueryModel);
}
@Log(title = "岗位管理", businessType = BusinessType.EXPORT)

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

@ -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<TableDataInfo<SysRole>> list (SysRole role) {
startPage();
List<SysRole> list = roleService.selectRoleList(role);
return getDataTable(list);
public Result<DataPageResp<SysRole>> list (SysRoleListReq sysRoleListReq) {
PageQueryModel<SysRole> 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<TableDataInfo<SysUser>> allocatedList (SysUser user) {
startPage();
public Result<DataPageResp<SysUser>> allocatedList (SysUser user) {
List<SysUser> list = userService.selectAllocatedList(user);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
/**
@ -162,10 +165,9 @@ public class SysRoleController extends BaseController {
*/
@RequiresPermissions("system:role:list")
@GetMapping("/authUser/unallocatedList")
public Result<TableDataInfo<SysUser>> unallocatedList (SysUser user) {
startPage();
public Result<DataPageResp<SysUser>> unallocatedList (SysUser user) {
List<SysUser> list = userService.selectUnallocatedList(user);
return getDataTable(list);
return Result.success(new DataPageResp<>(0,list));
}
/**

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

@ -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<TableDataInfo<SysUser>> list (SysUser user) {
startPage();
List<SysUser> list = userService.selectUserList(user);
return getDataTable(list);
public Result<DataPageResp<SysUser>> list (SysUserListReq sysUserListReq) {
PageQueryModel<SysUser> pageQueryModel = userService.pageQuery(SysUserPageQueryModel.reqBuild(sysUserListReq));
return resultList(pageQueryModel);
}
@Log(title = "用户管理", businessType = BusinessType.EXPORT)

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

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

43
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java 100644
View File

@ -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<SysDeptPageQueryModel> {
/**
* 部门名称
*/
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;
}
}

46
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java 100644
View File

@ -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<SysDictDataPageQueryModel> {
/**
* 字典类型
*/
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;
}
}

62
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java 100644
View File

@ -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<SysDictTypePageQueryModel> {
/**
* 字典名称
*/
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;
}
}

57
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java 100644
View File

@ -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<SysLogininforPageQueryModel> {
/**
* 用户账号
*/
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;
}
}

39
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java 100644
View File

@ -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<SysMenuPageQueryModel> {
/**
* 菜单名称
*/
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;
}
}

45
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java 100644
View File

@ -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<SysNoticePageQueryModel> {
/**
* 公告标题
*/
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;
}
}

66
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java 100644
View File

@ -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<SysOperlogPageQueryModel> {
/**
* 操作地址
*/
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;
}
}

47
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java 100644
View File

@ -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<SysPostPageQueryModel> {
/**
* 岗位编码
*/
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;
}
}

65
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java 100644
View File

@ -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<SysRolePageQueryModel> {
/**
* 角色名称
*/
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;
}
}

58
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java 100644
View File

@ -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<SysUserPageQueryModel> {
/**
* 用户昵称
*/
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;
}
}

34
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptListReq.java 100644
View File

@ -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;
}

37
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataListReq.java 100644
View File

@ -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;
}

51
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java 100644
View File

@ -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;
}

46
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java 100644
View File

@ -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;
}

32
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuListReq.java 100644
View File

@ -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;
}

37
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeListReq.java 100644
View File

@ -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;
}

54
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysOperlogListReq.java 100644
View File

@ -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;
}

40
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java 100644
View File

@ -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;
}

44
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java 100644
View File

@ -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;
}

48
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java 100644
View File

@ -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;
}

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

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

6
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java
View File

@ -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<SysDept> {
* @return 结果
*/
public int deleteDeptById (Long deptId);
PageQueryModel<SysDept> pageQuery(SysDeptPageQueryModel sysDeptPageQueryModel);
}

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java
View File

@ -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<SysDictData> {
* @return 结果
*/
public int updateDictData (SysDictData dictData);
PageQueryModel<SysDictData> pageQuery(SysDictDataPageQueryModel sysDictDataPageQueryModel);
}

5
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java
View File

@ -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<SysDictType> {
* @return 结果
*/
public boolean checkDictTypeUnique (SysDictType dictType);
PageQueryModel<SysDictType> pageQuery(SysDictTypePageQueryModel sysDictTypePageQueryModel);
}

4
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java
View File

@ -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<SysLogininfor> {
* 清空系统登录日志
*/
public void cleanLogininfor ();
PageQueryModel<SysLogininfor> pageQuery(SysLogininforPageQueryModel sysLogininforPageQueryModel);
}

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java
View File

@ -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<SysMenu> {
* @return 结果
*/
public boolean checkMenuNameUnique (SysMenu menu);
PageQueryModel<SysMenu> pageQuery(SysMenuPageQueryModel sysMenuPageQueryModel, Long userId);
}

4
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java
View File

@ -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<SysNotice> {
* @return 结果
*/
public int deleteNoticeByIds (Long[] noticeIds);
PageQueryModel<SysNotice> pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel);
}

5
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java
View File

@ -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<SysOperLog> {
* 清空操作日志
*/
public void cleanOperLog ();
PageQueryModel<SysOperLog> pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel);
}

5
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java
View File

@ -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<SysPost> {
* @return 结果
*/
public int updatePost (SysPost post);
PageQueryModel<SysPost> pageQuery(SysPostPageQueryModel sysPostPageQueryModel);
}

4
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java
View File

@ -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<SysRole> {
* @return 结果
*/
public int insertAuthUsers (Long roleId, Long[] userIds);
PageQueryModel<SysRole> pageQuery(SysRolePageQueryModel sysRolePageQueryModel);
}

4
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java
View File

@ -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<SysUser> {
* @return 结果
*/
public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName);
PageQueryModel<SysUser> pageQuery(SysUserPageQueryModel sysUserPageQueryModel);
}

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

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

18
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java
View File

@ -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<SysDeptMapper, SysDept>
private SysRoleMapper roleMapper;
@Override
public PageQueryModel<SysDept> pageQuery(SysDeptPageQueryModel sysDeptPageQueryModel) {
LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(StringUtils.isNotEmpty(sysDeptPageQueryModel.getDeptName()),SysDept::getDeptName, sysDeptPageQueryModel.getDeptName());
queryWrapper.eq(StringUtils.isNotEmpty(sysDeptPageQueryModel.getStatus()),SysDept::getStatus,sysDeptPageQueryModel.getStatus());
Page<SysDept> page = this.page(sysDeptPageQueryModel.buildPage(), queryWrapper);
return PageQueryModel.of(page);
}
/**
* 查询部门管理数据
*
@ -282,6 +298,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
return deptMapper.deleteDeptById(deptId);
}
/**
* 递归列表
*/

20
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java
View File

@ -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<SysDictDataMapper, SysDi
@Autowired
private SysDictDataMapper dictDataMapper;
/**
* 根据条件分页查询字典数据
*
@ -105,4 +115,14 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
}
return row;
}
@Override
public PageQueryModel<SysDictData> pageQuery(SysDictDataPageQueryModel sysDictdataPageQueryModel) {
LambdaQueryWrapper<SysDictData> 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<SysDictData> page = this.page(sysDictdataPageQueryModel.buildPage(), queryWrapper);
return PageQueryModel.of(page);
}
}

17
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -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<SysDictTypeMapper, SysDi
@Autowired
private SysDictDataMapper dictDataMapper;
@Override
public PageQueryModel<SysDictType> pageQuery(SysDictTypePageQueryModel sysDictDataPageQueryModel) {
LambdaQueryWrapper<SysDictType> 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<SysDictType> page = this.page(sysDictDataPageQueryModel.buildPage(), queryWrapper);
return PageQueryModel.of(page);
}
/**
* 项目启动时，初始化字典到缓存
*/

20
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java
View File

@ -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<SysLogininforMapper, S
public void cleanLogininfor () {
logininforMapper.cleanLogininfor();
}
@Override
public PageQueryModel<SysLogininfor> pageQuery (SysLogininforPageQueryModel sysLogininforPageQueryModel) {
LambdaQueryWrapper<SysLogininfor> 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<SysLogininfor> page = this.page(sysLogininforPageQueryModel.buildPage(), queryWrapper);
return PageQueryModel.of(page);
}
}

24
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java
View File

@ -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<SysMenuMapper, SysMenu> impl
}
return menuList;
}
@Override
public PageQueryModel<SysMenu> pageQuery(SysMenuPageQueryModel sysMenuPageQueryModel, Long userId) {
Page<SysMenu> page = null;
// 管理员显示所有菜单信息
if (SysUser.isAdmin(userId)) {
LambdaQueryWrapper<SysMenu> 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<SysMenu> 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<SysMenuMapper, SysMenu> impl
return UserConstants.UNIQUE;
}
/**
* 获取路由名称
*

18
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java
View File

@ -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<SysNoticeMapper, SysNotice
@Autowired
private SysNoticeMapper noticeMapper;
/**
* 查询公告信息
*
@ -90,4 +98,14 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
public int deleteNoticeByIds (Long[] noticeIds) {
return noticeMapper.deleteNoticeByIds(noticeIds);
}
@Override
public PageQueryModel<SysNotice> pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel) {
LambdaQueryWrapper<SysNotice> 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<SysNotice> page = this.page(sysNoticePageQueryModel.buildPage(), queryWrapper);
return PageQueryModel.of(page);
}
}

21
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java
View File

@ -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<SysOperLogMapper, SysOper
public void cleanOperLog () {
operLogMapper.cleanOperLog();
}
@Override
public PageQueryModel<SysOperLog> pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel) {
LambdaQueryWrapper<SysOperLog> 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<SysOperLog> page = this.page(sysOperlogPageQueryModel.buildPage(), queryWrapper);
return PageQueryModel.of(page);
}
}

16
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java
View File

@ -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<SysPostMapper, SysPost> impl
public int updatePost (SysPost post) {
return postMapper.updatePost(post);
}
@Override
public PageQueryModel<SysPost> pageQuery(SysPostPageQueryModel sysPostPageQueryModel) {
LambdaQueryWrapper<SysPost> 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<SysPost> page = this.page(sysPostPageQueryModel.buildPage(), queryWrapper);
return PageQueryModel.of(page);
}
}

18
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java
View File

@ -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<SysRoleMapper, SysRole> impl
}
return userRoleMapper.batchUserRole(list);
}
@Override
public PageQueryModel<SysRole> pageQuery(SysRolePageQueryModel sysRolePageQueryModel) {
LambdaQueryWrapper<SysRole> 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<SysRole> page = this.page(sysRolePageQueryModel.buildPage(), queryWrapper);
return PageQueryModel.of(page);
}
}

21
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
View File

@ -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<SysUserMapper, SysUser> impl
return successMsg.toString();
}
@Override
public PageQueryModel<SysUser> pageQuery(SysUserPageQueryModel sysUserPageQueryModel) {
LambdaQueryWrapper<SysUser> 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<SysUser> page = this.page(sysUserPageQueryModel.buildPage(), queryWrapper);
return PageQueryModel.of(page);
}
//nickName
//phonenumber
//status
//beginTime
//endTime
}