chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
likewei 2024-08-19 16:03:12 +08:00
parent 975499e428 052d11f60e
commit c6a74f8846
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java
View File

@ -17,6 +17,8 @@ public class ListRoleDTO extends CommonParam {
private String roleKey; private String roleKey;
private Integer status; private Integer status;
private Params params; private Params params;
private Integer page; // 当前页码
private Integer limit; // 每页条数
@Data @Data
@EqualsAndHashCode @EqualsAndHashCode

2
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictController.java
View File

@ -50,7 +50,7 @@ public class DictController {
@SysLog(value = "字典数据", businessType = BusinessType.EXPORT) @SysLog(value = "字典数据", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:dict:export") @RequiresPermissions("system:dict:export")
@PostMapping("/export") @GetMapping("/export")
public void export(HttpServletResponse response, ListDictDTO dictData) public void export(HttpServletResponse response, ListDictDTO dictData)
{ {
CommonParam commonParam = CommonParam.buildAllRequest(); CommonParam commonParam = CommonParam.buildAllRequest();

4
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictTypeController.java
View File

@ -49,9 +49,9 @@ public class DictTypeController {
return AjaxResult.success(pageResult); return AjaxResult.success(pageResult);
} }
@SysLog(value = "字典类型", businessType = BusinessType.EXPORT) @SysLog(value = "字典类型", businessType = BusinessType.DOWNLOAD)
@RequiresPermissions("system:dict:export") @RequiresPermissions("system:dict:export")
@PostMapping("/export") @GetMapping("/export")
public void export(HttpServletResponse response, SysDictType dictType) public void export(HttpServletResponse response, SysDictType dictType)
{ {
CommonParam commonParam = CommonParam.buildAllRequest(); CommonParam commonParam = CommonParam.buildAllRequest();

8
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java
View File

@ -38,14 +38,16 @@ public class RoleController {
// return roleService.selectRoleList(listRole); // return roleService.selectRoleList(listRole);
// } // }
@RequiresPermissions("system:role:list") // @RequiresPermissions("system:role:list")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list( public AjaxResult list(
@RequestParam(required = false) String roleName, @RequestParam(required = false) String roleName,
@RequestParam(required = false) String roleKey, @RequestParam(required = false) String roleKey,
@RequestParam(required = false) Integer status, @RequestParam(required = false) Integer status,
@RequestParam(required = false) String beginTime, @RequestParam(required = false) String beginTime,
@RequestParam(required = false) String endTime @RequestParam(required = false) String endTime,
@RequestParam(defaultValue = "1") Integer page, // 默认页码为1
@RequestParam(defaultValue = "10") Integer limit // 默认每页条数为10
) { ) {
ListRoleDTO.Params params = new ListRoleDTO.Params(); ListRoleDTO.Params params = new ListRoleDTO.Params();
params.setBeginTime(beginTime); params.setBeginTime(beginTime);
@ -56,6 +58,8 @@ public class RoleController {
listRole.setRoleKey(roleKey); listRole.setRoleKey(roleKey);
listRole.setStatus(status); listRole.setStatus(status);
listRole.setParams(params); listRole.setParams(params);
listRole.setPage(page);
listRole.setLimit(limit);
return roleService.selectRoleList(listRole); return roleService.selectRoleList(listRole);
} }

2
chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/SysConfigController.java
View File

@ -47,7 +47,7 @@ public class SysConfigController
@SysLog(value = "参数管理", businessType = BusinessType.EXPORT) @SysLog(value = "参数管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:config:export") @RequiresPermissions("system:config:export")
@PostMapping("/export") @GetMapping("/export")
public void export(HttpServletResponse response, SysConfig config) public void export(HttpServletResponse response, SysConfig config)
{ {
CommonParam commonParam = CommonParam.buildAllRequest(); CommonParam commonParam = CommonParam.buildAllRequest();