mirror of
https://gitee.com/dromara/RuoYi-Vue-Plus.git
synced 2026-09-21 02:25:56 +08:00
update 更新参数命名 ;
This commit is contained in:
parent
7a2075d8f3
commit
87c33f12e9
@ -37,8 +37,8 @@ public class SysConfigController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@SaCheckPermission("system:config:list")
|
@SaCheckPermission("system:config:list")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo<SysConfigVo> list(SysConfigBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysConfigVo> list(SysConfigBo config, PageQuery pageQuery) {
|
||||||
return configService.selectPageConfigList(bo, pageQuery);
|
return configService.selectPageConfigList(config, pageQuery);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -47,8 +47,8 @@ public class SysConfigController extends BaseController {
|
|||||||
@Log(title = "参数管理", businessType = BusinessType.EXPORT)
|
@Log(title = "参数管理", businessType = BusinessType.EXPORT)
|
||||||
@SaCheckPermission("system:config:export")
|
@SaCheckPermission("system:config:export")
|
||||||
@PostMapping("/export")
|
@PostMapping("/export")
|
||||||
public void export(SysConfigBo bo, HttpServletResponse response) {
|
public void export(SysConfigBo config, HttpServletResponse response) {
|
||||||
List<SysConfigVo> list = configService.selectConfigList(bo);
|
List<SysConfigVo> list = configService.selectConfigList(config);
|
||||||
ExcelUtil.exportExcel(list, "参数数据", SysConfigVo.class, response);
|
ExcelUtil.exportExcel(list, "参数数据", SysConfigVo.class, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -79,11 +79,11 @@ public class SysConfigController extends BaseController {
|
|||||||
@SaCheckPermission("system:config:add")
|
@SaCheckPermission("system:config:add")
|
||||||
@Log(title = "参数管理", businessType = BusinessType.INSERT)
|
@Log(title = "参数管理", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public R<Void> add(@Validated @RequestBody SysConfigBo bo) {
|
public R<Void> add(@Validated @RequestBody SysConfigBo config) {
|
||||||
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
|
||||||
return R.fail("新增参数'" + bo.getConfigName() + "'失败,参数键名已存在");
|
return R.fail("新增参数'" + config.getConfigName() + "'失败,参数键名已存在");
|
||||||
}
|
}
|
||||||
configService.insertConfig(bo);
|
configService.insertConfig(config);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,11 +93,11 @@ public class SysConfigController extends BaseController {
|
|||||||
@SaCheckPermission("system:config:edit")
|
@SaCheckPermission("system:config:edit")
|
||||||
@Log(title = "参数管理", businessType = BusinessType.UPDATE)
|
@Log(title = "参数管理", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public R<Void> edit(@Validated @RequestBody SysConfigBo bo) {
|
public R<Void> edit(@Validated @RequestBody SysConfigBo config) {
|
||||||
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
|
||||||
return R.fail("修改参数'" + bo.getConfigName() + "'失败,参数键名已存在");
|
return R.fail("修改参数'" + config.getConfigName() + "'失败,参数键名已存在");
|
||||||
}
|
}
|
||||||
configService.updateConfig(bo);
|
configService.updateConfig(config);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -107,8 +107,8 @@ public class SysConfigController extends BaseController {
|
|||||||
@SaCheckPermission("system:config:edit")
|
@SaCheckPermission("system:config:edit")
|
||||||
@Log(title = "参数管理", businessType = BusinessType.UPDATE)
|
@Log(title = "参数管理", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping("/updateByKey")
|
@PutMapping("/updateByKey")
|
||||||
public R<Void> updateByKey(@RequestBody SysConfigBo bo) {
|
public R<Void> updateByKey(@RequestBody SysConfigBo config) {
|
||||||
configService.updateConfig(bo);
|
configService.updateConfig(config);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -35,8 +35,8 @@ public class SysDeptController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@SaCheckPermission("system:dept:list")
|
@SaCheckPermission("system:dept:list")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public R<List<SysDeptVo>> list(SysDeptBo bo) {
|
public R<List<SysDeptVo>> list(SysDeptBo dept) {
|
||||||
List<SysDeptVo> depts = deptService.selectDeptList(bo);
|
List<SysDeptVo> depts = deptService.selectDeptList(dept);
|
||||||
return R.ok(depts);
|
return R.ok(depts);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,11 +72,11 @@ public class SysDeptController extends BaseController {
|
|||||||
@SaCheckPermission("system:dept:add")
|
@SaCheckPermission("system:dept:add")
|
||||||
@Log(title = "部门管理", businessType = BusinessType.INSERT)
|
@Log(title = "部门管理", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public R<Void> add(@Validated @RequestBody SysDeptBo bo) {
|
public R<Void> add(@Validated @RequestBody SysDeptBo dept) {
|
||||||
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
|
||||||
return R.fail("新增部门'" + bo.getDeptName() + "'失败,部门名称已存在");
|
return R.fail("新增部门'" + dept.getDeptName() + "'失败,部门名称已存在");
|
||||||
}
|
}
|
||||||
return toAjax(deptService.insertDept(bo));
|
return toAjax(deptService.insertDept(dept));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -85,18 +85,18 @@ public class SysDeptController extends BaseController {
|
|||||||
@SaCheckPermission("system:dept:edit")
|
@SaCheckPermission("system:dept:edit")
|
||||||
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
|
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public R<Void> edit(@Validated @RequestBody SysDeptBo bo) {
|
public R<Void> edit(@Validated @RequestBody SysDeptBo dept) {
|
||||||
Long deptId = bo.getDeptId();
|
Long deptId = dept.getDeptId();
|
||||||
deptService.checkDeptDataScope(deptId);
|
deptService.checkDeptDataScope(deptId);
|
||||||
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
|
||||||
return R.fail("修改部门'" + bo.getDeptName() + "'失败,部门名称已存在");
|
return R.fail("修改部门'" + dept.getDeptName() + "'失败,部门名称已存在");
|
||||||
} else if (bo.getParentId().equals(deptId)) {
|
} else if (dept.getParentId().equals(deptId)) {
|
||||||
return R.fail("修改部门'" + bo.getDeptName() + "'失败,上级部门不能是自己");
|
return R.fail("修改部门'" + dept.getDeptName() + "'失败,上级部门不能是自己");
|
||||||
} else if (StringUtils.equals(UserConstants.DEPT_DISABLE, bo.getStatus())
|
} else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
|
||||||
&& deptService.selectNormalChildrenDeptById(deptId) > 0) {
|
&& deptService.selectNormalChildrenDeptById(deptId) > 0) {
|
||||||
return R.fail("该部门包含未停用的子部门!");
|
return R.fail("该部门包含未停用的子部门!");
|
||||||
}
|
}
|
||||||
return toAjax(deptService.updateDept(bo));
|
return toAjax(deptService.updateDept(dept));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -41,8 +41,8 @@ public class SysDictDataController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@SaCheckPermission("system:dict:list")
|
@SaCheckPermission("system:dict:list")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo<SysDictDataVo> list(SysDictDataBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysDictDataVo> list(SysDictDataBo dictData, PageQuery pageQuery) {
|
||||||
return dictDataService.selectPageDictDataList(bo, pageQuery);
|
return dictDataService.selectPageDictDataList(dictData, pageQuery);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -51,8 +51,8 @@ public class SysDictDataController extends BaseController {
|
|||||||
@Log(title = "字典数据", businessType = BusinessType.EXPORT)
|
@Log(title = "字典数据", businessType = BusinessType.EXPORT)
|
||||||
@SaCheckPermission("system:dict:export")
|
@SaCheckPermission("system:dict:export")
|
||||||
@PostMapping("/export")
|
@PostMapping("/export")
|
||||||
public void export(SysDictDataBo bo, HttpServletResponse response) {
|
public void export(SysDictDataBo dictData, HttpServletResponse response) {
|
||||||
List<SysDictDataVo> list = dictDataService.selectDictDataList(bo);
|
List<SysDictDataVo> list = dictDataService.selectDictDataList(dictData);
|
||||||
ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response);
|
ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -87,8 +87,8 @@ public class SysDictDataController extends BaseController {
|
|||||||
@SaCheckPermission("system:dict:add")
|
@SaCheckPermission("system:dict:add")
|
||||||
@Log(title = "字典数据", businessType = BusinessType.INSERT)
|
@Log(title = "字典数据", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public R<Void> add(@Validated @RequestBody SysDictDataBo bo) {
|
public R<Void> add(@Validated @RequestBody SysDictDataBo dictData) {
|
||||||
dictDataService.insertDictData(bo);
|
dictDataService.insertDictData(dictData);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -98,8 +98,8 @@ public class SysDictDataController extends BaseController {
|
|||||||
@SaCheckPermission("system:dict:edit")
|
@SaCheckPermission("system:dict:edit")
|
||||||
@Log(title = "字典数据", businessType = BusinessType.UPDATE)
|
@Log(title = "字典数据", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public R<Void> edit(@Validated @RequestBody SysDictDataBo bo) {
|
public R<Void> edit(@Validated @RequestBody SysDictDataBo dictData) {
|
||||||
dictDataService.updateDictData(bo);
|
dictDataService.updateDictData(dictData);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -38,8 +38,8 @@ public class SysDictTypeController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@SaCheckPermission("system:dict:list")
|
@SaCheckPermission("system:dict:list")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo<SysDictTypeVo> list(SysDictTypeBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysDictTypeVo> list(SysDictTypeBo dictType, PageQuery pageQuery) {
|
||||||
return dictTypeService.selectPageDictTypeList(bo, pageQuery);
|
return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -70,11 +70,11 @@ public class SysDictTypeController extends BaseController {
|
|||||||
@SaCheckPermission("system:dict:add")
|
@SaCheckPermission("system:dict:add")
|
||||||
@Log(title = "字典类型", businessType = BusinessType.INSERT)
|
@Log(title = "字典类型", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public R<Void> add(@Validated @RequestBody SysDictTypeBo bo) {
|
public R<Void> add(@Validated @RequestBody SysDictTypeBo dictType) {
|
||||||
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dictType))) {
|
||||||
return R.fail("新增字典'" + bo.getDictName() + "'失败,字典类型已存在");
|
return R.fail("新增字典'" + dictType.getDictName() + "'失败,字典类型已存在");
|
||||||
}
|
}
|
||||||
dictTypeService.insertDictType(bo);
|
dictTypeService.insertDictType(dictType);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -84,11 +84,11 @@ public class SysDictTypeController extends BaseController {
|
|||||||
@SaCheckPermission("system:dict:edit")
|
@SaCheckPermission("system:dict:edit")
|
||||||
@Log(title = "字典类型", businessType = BusinessType.UPDATE)
|
@Log(title = "字典类型", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public R<Void> edit(@Validated @RequestBody SysDictTypeBo bo) {
|
public R<Void> edit(@Validated @RequestBody SysDictTypeBo dictType) {
|
||||||
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dictType))) {
|
||||||
return R.fail("修改字典'" + bo.getDictName() + "'失败,字典类型已存在");
|
return R.fail("修改字典'" + dictType.getDictName() + "'失败,字典类型已存在");
|
||||||
}
|
}
|
||||||
dictTypeService.updateDictType(bo);
|
dictTypeService.updateDictType(dictType);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -83,13 +83,13 @@ public class SysMenuController extends BaseController {
|
|||||||
@SaCheckPermission("system:menu:add")
|
@SaCheckPermission("system:menu:add")
|
||||||
@Log(title = "菜单管理", businessType = BusinessType.INSERT)
|
@Log(title = "菜单管理", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public R<Void> add(@Validated @RequestBody SysMenuBo bo) {
|
public R<Void> add(@Validated @RequestBody SysMenuBo menu) {
|
||||||
if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
|
||||||
return R.fail("新增菜单'" + bo.getMenuName() + "'失败,菜单名称已存在");
|
return R.fail("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
|
||||||
} else if (UserConstants.YES_FRAME.equals(bo.getIsFrame()) && !StringUtils.ishttp(bo.getPath())) {
|
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
|
||||||
return R.fail("新增菜单'" + bo.getMenuName() + "'失败,地址必须以http(s)://开头");
|
return R.fail("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
|
||||||
}
|
}
|
||||||
return toAjax(menuService.insertMenu(bo));
|
return toAjax(menuService.insertMenu(menu));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -98,15 +98,15 @@ public class SysMenuController extends BaseController {
|
|||||||
@SaCheckPermission("system:menu:edit")
|
@SaCheckPermission("system:menu:edit")
|
||||||
@Log(title = "菜单管理", businessType = BusinessType.UPDATE)
|
@Log(title = "菜单管理", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public R<Void> edit(@Validated @RequestBody SysMenuBo bo) {
|
public R<Void> edit(@Validated @RequestBody SysMenuBo menu) {
|
||||||
if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
|
||||||
return R.fail("修改菜单'" + bo.getMenuName() + "'失败,菜单名称已存在");
|
return R.fail("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
|
||||||
} else if (UserConstants.YES_FRAME.equals(bo.getIsFrame()) && !StringUtils.ishttp(bo.getPath())) {
|
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
|
||||||
return R.fail("修改菜单'" + bo.getMenuName() + "'失败,地址必须以http(s)://开头");
|
return R.fail("修改菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
|
||||||
} else if (bo.getMenuId().equals(bo.getParentId())) {
|
} else if (menu.getMenuId().equals(menu.getParentId())) {
|
||||||
return R.fail("修改菜单'" + bo.getMenuName() + "'失败,上级菜单不能选择自己");
|
return R.fail("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己");
|
||||||
}
|
}
|
||||||
return toAjax(menuService.updateMenu(bo));
|
return toAjax(menuService.updateMenu(menu));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -32,8 +32,8 @@ public class SysNoticeController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@SaCheckPermission("system:notice:list")
|
@SaCheckPermission("system:notice:list")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo<SysNoticeVo> list(SysNoticeBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
|
||||||
return noticeService.selectPageNoticeList(bo, pageQuery);
|
return noticeService.selectPageNoticeList(notice, pageQuery);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -53,8 +53,8 @@ public class SysNoticeController extends BaseController {
|
|||||||
@SaCheckPermission("system:notice:add")
|
@SaCheckPermission("system:notice:add")
|
||||||
@Log(title = "通知公告", businessType = BusinessType.INSERT)
|
@Log(title = "通知公告", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public R<Void> add(@Validated @RequestBody SysNoticeBo bo) {
|
public R<Void> add(@Validated @RequestBody SysNoticeBo notice) {
|
||||||
return toAjax(noticeService.insertNotice(bo));
|
return toAjax(noticeService.insertNotice(notice));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -63,8 +63,8 @@ public class SysNoticeController extends BaseController {
|
|||||||
@SaCheckPermission("system:notice:edit")
|
@SaCheckPermission("system:notice:edit")
|
||||||
@Log(title = "通知公告", businessType = BusinessType.UPDATE)
|
@Log(title = "通知公告", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public R<Void> edit(@Validated @RequestBody SysNoticeBo bo) {
|
public R<Void> edit(@Validated @RequestBody SysNoticeBo notice) {
|
||||||
return toAjax(noticeService.updateNotice(bo));
|
return toAjax(noticeService.updateNotice(notice));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -37,8 +37,8 @@ public class SysPostController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@SaCheckPermission("system:post:list")
|
@SaCheckPermission("system:post:list")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo<SysPostVo> list(SysPostBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysPostVo> list(SysPostBo post, PageQuery pageQuery) {
|
||||||
return postService.selectPagePostList(bo, pageQuery);
|
return postService.selectPagePostList(post, pageQuery);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -47,8 +47,8 @@ public class SysPostController extends BaseController {
|
|||||||
@Log(title = "岗位管理", businessType = BusinessType.EXPORT)
|
@Log(title = "岗位管理", businessType = BusinessType.EXPORT)
|
||||||
@SaCheckPermission("system:post:export")
|
@SaCheckPermission("system:post:export")
|
||||||
@PostMapping("/export")
|
@PostMapping("/export")
|
||||||
public void export(SysPostBo bo, HttpServletResponse response) {
|
public void export(SysPostBo post, HttpServletResponse response) {
|
||||||
List<SysPostVo> list = postService.selectPostList(bo);
|
List<SysPostVo> list = postService.selectPostList(post);
|
||||||
ExcelUtil.exportExcel(list, "岗位数据", SysPostVo.class, response);
|
ExcelUtil.exportExcel(list, "岗位数据", SysPostVo.class, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -69,13 +69,13 @@ public class SysPostController extends BaseController {
|
|||||||
@SaCheckPermission("system:post:add")
|
@SaCheckPermission("system:post:add")
|
||||||
@Log(title = "岗位管理", businessType = BusinessType.INSERT)
|
@Log(title = "岗位管理", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public R<Void> add(@Validated @RequestBody SysPostBo bo) {
|
public R<Void> add(@Validated @RequestBody SysPostBo post) {
|
||||||
if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
|
||||||
return R.fail("新增岗位'" + bo.getPostName() + "'失败,岗位名称已存在");
|
return R.fail("新增岗位'" + post.getPostName() + "'失败,岗位名称已存在");
|
||||||
} else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(bo))) {
|
} else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
|
||||||
return R.fail("新增岗位'" + bo.getPostName() + "'失败,岗位编码已存在");
|
return R.fail("新增岗位'" + post.getPostName() + "'失败,岗位编码已存在");
|
||||||
}
|
}
|
||||||
return toAjax(postService.insertPost(bo));
|
return toAjax(postService.insertPost(post));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -84,13 +84,13 @@ public class SysPostController extends BaseController {
|
|||||||
@SaCheckPermission("system:post:edit")
|
@SaCheckPermission("system:post:edit")
|
||||||
@Log(title = "岗位管理", businessType = BusinessType.UPDATE)
|
@Log(title = "岗位管理", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public R<Void> edit(@Validated @RequestBody SysPostBo bo) {
|
public R<Void> edit(@Validated @RequestBody SysPostBo post) {
|
||||||
if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
|
||||||
return R.fail("修改岗位'" + bo.getPostName() + "'失败,岗位名称已存在");
|
return R.fail("修改岗位'" + post.getPostName() + "'失败,岗位名称已存在");
|
||||||
} else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(bo))) {
|
} else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
|
||||||
return R.fail("修改岗位'" + bo.getPostName() + "'失败,岗位编码已存在");
|
return R.fail("修改岗位'" + post.getPostName() + "'失败,岗位编码已存在");
|
||||||
}
|
}
|
||||||
return toAjax(postService.updatePost(bo));
|
return toAjax(postService.updatePost(post));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -50,8 +50,8 @@ public class SysRoleController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@SaCheckPermission("system:role:list")
|
@SaCheckPermission("system:role:list")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo<SysRoleVo> list(SysRoleBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysRoleVo> list(SysRoleBo role, PageQuery pageQuery) {
|
||||||
return roleService.selectPageRoleList(bo, pageQuery);
|
return roleService.selectPageRoleList(role, pageQuery);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -60,8 +60,8 @@ public class SysRoleController extends BaseController {
|
|||||||
@Log(title = "角色管理", businessType = BusinessType.EXPORT)
|
@Log(title = "角色管理", businessType = BusinessType.EXPORT)
|
||||||
@SaCheckPermission("system:role:export")
|
@SaCheckPermission("system:role:export")
|
||||||
@PostMapping("/export")
|
@PostMapping("/export")
|
||||||
public void export(SysRoleBo bo, HttpServletResponse response) {
|
public void export(SysRoleBo role, HttpServletResponse response) {
|
||||||
List<SysRoleVo> list = roleService.selectRoleList(bo);
|
List<SysRoleVo> list = roleService.selectRoleList(role);
|
||||||
ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response);
|
ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -83,13 +83,13 @@ public class SysRoleController extends BaseController {
|
|||||||
@SaCheckPermission("system:role:add")
|
@SaCheckPermission("system:role:add")
|
||||||
@Log(title = "角色管理", businessType = BusinessType.INSERT)
|
@Log(title = "角色管理", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public R<Void> add(@Validated @RequestBody SysRoleBo bo) {
|
public R<Void> add(@Validated @RequestBody SysRoleBo role) {
|
||||||
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
|
||||||
return R.fail("新增角色'" + bo.getRoleName() + "'失败,角色名称已存在");
|
return R.fail("新增角色'" + role.getRoleName() + "'失败,角色名称已存在");
|
||||||
} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(bo))) {
|
} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
|
||||||
return R.fail("新增角色'" + bo.getRoleName() + "'失败,角色权限已存在");
|
return R.fail("新增角色'" + role.getRoleName() + "'失败,角色权限已存在");
|
||||||
}
|
}
|
||||||
return toAjax(roleService.insertRole(bo));
|
return toAjax(roleService.insertRole(role));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -99,16 +99,16 @@ public class SysRoleController extends BaseController {
|
|||||||
@SaCheckPermission("system:role:edit")
|
@SaCheckPermission("system:role:edit")
|
||||||
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public R<Void> edit(@Validated @RequestBody SysRoleBo bo) {
|
public R<Void> edit(@Validated @RequestBody SysRoleBo role) {
|
||||||
roleService.checkRoleAllowed(bo);
|
roleService.checkRoleAllowed(role);
|
||||||
roleService.checkRoleDataScope(bo.getRoleId());
|
roleService.checkRoleDataScope(role.getRoleId());
|
||||||
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(bo))) {
|
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
|
||||||
return R.fail("修改角色'" + bo.getRoleName() + "'失败,角色名称已存在");
|
return R.fail("修改角色'" + role.getRoleName() + "'失败,角色名称已存在");
|
||||||
} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(bo))) {
|
} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
|
||||||
return R.fail("修改角色'" + bo.getRoleName() + "'失败,角色权限已存在");
|
return R.fail("修改角色'" + role.getRoleName() + "'失败,角色权限已存在");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (roleService.updateRole(bo) > 0) {
|
if (roleService.updateRole(role) > 0) {
|
||||||
// 更新缓存用户权限
|
// 更新缓存用户权限
|
||||||
LoginUser loginUser = LoginHelper.getLoginUser();
|
LoginUser loginUser = LoginHelper.getLoginUser();
|
||||||
SysUser sysUser = userService.selectUserById(loginUser.getUserId());
|
SysUser sysUser = userService.selectUserById(loginUser.getUserId());
|
||||||
@ -118,7 +118,7 @@ public class SysRoleController extends BaseController {
|
|||||||
}
|
}
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
return R.fail("修改角色'" + bo.getRoleName() + "'失败,请联系管理员");
|
return R.fail("修改角色'" + role.getRoleName() + "'失败,请联系管理员");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -127,10 +127,10 @@ public class SysRoleController extends BaseController {
|
|||||||
@SaCheckPermission("system:role:edit")
|
@SaCheckPermission("system:role:edit")
|
||||||
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping("/dataScope")
|
@PutMapping("/dataScope")
|
||||||
public R<Void> dataScope(@RequestBody SysRoleBo bo) {
|
public R<Void> dataScope(@RequestBody SysRoleBo role) {
|
||||||
roleService.checkRoleAllowed(bo);
|
roleService.checkRoleAllowed(role);
|
||||||
roleService.checkRoleDataScope(bo.getRoleId());
|
roleService.checkRoleDataScope(role.getRoleId());
|
||||||
return toAjax(roleService.authDataScope(bo));
|
return toAjax(roleService.authDataScope(role));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -139,10 +139,10 @@ public class SysRoleController extends BaseController {
|
|||||||
@SaCheckPermission("system:role:edit")
|
@SaCheckPermission("system:role:edit")
|
||||||
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping("/changeStatus")
|
@PutMapping("/changeStatus")
|
||||||
public R<Void> changeStatus(@RequestBody SysRoleBo bo) {
|
public R<Void> changeStatus(@RequestBody SysRoleBo role) {
|
||||||
roleService.checkRoleAllowed(bo);
|
roleService.checkRoleAllowed(role);
|
||||||
roleService.checkRoleDataScope(bo.getRoleId());
|
roleService.checkRoleDataScope(role.getRoleId());
|
||||||
return toAjax(roleService.updateRoleStatus(bo));
|
return toAjax(roleService.updateRoleStatus(role));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import java.util.List;
|
|||||||
public interface ISysConfigService {
|
public interface ISysConfigService {
|
||||||
|
|
||||||
|
|
||||||
TableDataInfo<SysConfigVo> selectPageConfigList(SysConfigBo bo, PageQuery pageQuery);
|
TableDataInfo<SysConfigVo> selectPageConfigList(SysConfigBo config, PageQuery pageQuery);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询参数配置信息
|
* 查询参数配置信息
|
||||||
@ -43,10 +43,10 @@ public interface ISysConfigService {
|
|||||||
/**
|
/**
|
||||||
* 查询参数配置列表
|
* 查询参数配置列表
|
||||||
*
|
*
|
||||||
* @param bo 参数配置信息
|
* @param config 参数配置信息
|
||||||
* @return 参数配置集合
|
* @return 参数配置集合
|
||||||
*/
|
*/
|
||||||
List<SysConfigVo> selectConfigList(SysConfigBo bo);
|
List<SysConfigVo> selectConfigList(SysConfigBo config);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增参数配置
|
* 新增参数配置
|
||||||
@ -89,9 +89,9 @@ public interface ISysConfigService {
|
|||||||
/**
|
/**
|
||||||
* 校验参数键名是否唯一
|
* 校验参数键名是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 参数信息
|
* @param config 参数信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
String checkConfigKeyUnique(SysConfigBo bo);
|
String checkConfigKeyUnique(SysConfigBo config);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,10 +16,10 @@ public interface ISysDeptService {
|
|||||||
/**
|
/**
|
||||||
* 查询部门管理数据
|
* 查询部门管理数据
|
||||||
*
|
*
|
||||||
* @param bo 部门信息
|
* @param dept 部门信息
|
||||||
* @return 部门信息集合
|
* @return 部门信息集合
|
||||||
*/
|
*/
|
||||||
List<SysDeptVo> selectDeptList(SysDeptBo bo);
|
List<SysDeptVo> selectDeptList(SysDeptBo dept);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询部门树结构信息
|
* 查询部门树结构信息
|
||||||
@ -80,10 +80,10 @@ public interface ISysDeptService {
|
|||||||
/**
|
/**
|
||||||
* 校验部门名称是否唯一
|
* 校验部门名称是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 部门信息
|
* @param dept 部门信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
String checkDeptNameUnique(SysDeptBo bo);
|
String checkDeptNameUnique(SysDeptBo dept);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验部门是否有数据权限
|
* 校验部门是否有数据权限
|
||||||
|
|||||||
@ -15,15 +15,15 @@ import java.util.List;
|
|||||||
public interface ISysDictDataService {
|
public interface ISysDictDataService {
|
||||||
|
|
||||||
|
|
||||||
TableDataInfo<SysDictDataVo> selectPageDictDataList(SysDictDataBo bo, PageQuery pageQuery);
|
TableDataInfo<SysDictDataVo> selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据条件分页查询字典数据
|
* 根据条件分页查询字典数据
|
||||||
*
|
*
|
||||||
* @param bo 字典数据信息
|
* @param dictData 字典数据信息
|
||||||
* @return 字典数据集合信息
|
* @return 字典数据集合信息
|
||||||
*/
|
*/
|
||||||
List<SysDictDataVo> selectDictDataList(SysDictDataBo bo);
|
List<SysDictDataVo> selectDictDataList(SysDictDataBo dictData);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据字典类型和字典键值查询字典数据信息
|
* 根据字典类型和字典键值查询字典数据信息
|
||||||
|
|||||||
@ -17,15 +17,15 @@ import java.util.List;
|
|||||||
public interface ISysDictTypeService {
|
public interface ISysDictTypeService {
|
||||||
|
|
||||||
|
|
||||||
TableDataInfo<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo bo, PageQuery pageQuery);
|
TableDataInfo<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据条件分页查询字典类型
|
* 根据条件分页查询字典类型
|
||||||
*
|
*
|
||||||
* @param bo 字典类型信息
|
* @param dictType 字典类型信息
|
||||||
* @return 字典类型集合信息
|
* @return 字典类型集合信息
|
||||||
*/
|
*/
|
||||||
List<SysDictTypeVo> selectDictTypeList(SysDictTypeBo bo);
|
List<SysDictTypeVo> selectDictTypeList(SysDictTypeBo dictType);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据所有字典类型
|
* 根据所有字典类型
|
||||||
@ -99,8 +99,8 @@ public interface ISysDictTypeService {
|
|||||||
/**
|
/**
|
||||||
* 校验字典类型称是否唯一
|
* 校验字典类型称是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 字典类型
|
* @param dictType 字典类型
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
String checkDictTypeUnique(SysDictTypeBo bo);
|
String checkDictTypeUnique(SysDictTypeBo dictType);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -132,8 +132,8 @@ public interface ISysMenuService {
|
|||||||
/**
|
/**
|
||||||
* 校验菜单名称是否唯一
|
* 校验菜单名称是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 菜单信息
|
* @param menu 菜单信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
String checkMenuNameUnique(SysMenuBo bo);
|
String checkMenuNameUnique(SysMenuBo menu);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import java.util.List;
|
|||||||
public interface ISysNoticeService {
|
public interface ISysNoticeService {
|
||||||
|
|
||||||
|
|
||||||
TableDataInfo<SysNoticeVo> selectPageNoticeList(SysNoticeBo bo, PageQuery pageQuery);
|
TableDataInfo<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询公告信息
|
* 查询公告信息
|
||||||
@ -28,10 +28,10 @@ public interface ISysNoticeService {
|
|||||||
/**
|
/**
|
||||||
* 查询公告列表
|
* 查询公告列表
|
||||||
*
|
*
|
||||||
* @param bo 公告信息
|
* @param notice 公告信息
|
||||||
* @return 公告集合
|
* @return 公告集合
|
||||||
*/
|
*/
|
||||||
List<SysNoticeVo> selectNoticeList(SysNoticeBo bo);
|
List<SysNoticeVo> selectNoticeList(SysNoticeBo notice);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增公告
|
* 新增公告
|
||||||
|
|||||||
@ -15,15 +15,15 @@ import java.util.List;
|
|||||||
public interface ISysPostService {
|
public interface ISysPostService {
|
||||||
|
|
||||||
|
|
||||||
TableDataInfo<SysPostVo> selectPagePostList(SysPostBo bo, PageQuery pageQuery);
|
TableDataInfo<SysPostVo> selectPagePostList(SysPostBo post, PageQuery pageQuery);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询岗位信息集合
|
* 查询岗位信息集合
|
||||||
*
|
*
|
||||||
* @param bo 岗位信息
|
* @param post 岗位信息
|
||||||
* @return 岗位列表
|
* @return 岗位列表
|
||||||
*/
|
*/
|
||||||
List<SysPostVo> selectPostList(SysPostBo bo);
|
List<SysPostVo> selectPostList(SysPostBo post);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询所有岗位
|
* 查询所有岗位
|
||||||
@ -51,18 +51,18 @@ public interface ISysPostService {
|
|||||||
/**
|
/**
|
||||||
* 校验岗位名称
|
* 校验岗位名称
|
||||||
*
|
*
|
||||||
* @param bo 岗位信息
|
* @param post 岗位信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
String checkPostNameUnique(SysPostBo bo);
|
String checkPostNameUnique(SysPostBo post);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验岗位编码
|
* 校验岗位编码
|
||||||
*
|
*
|
||||||
* @param bo 岗位信息
|
* @param post 岗位信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
String checkPostCodeUnique(SysPostBo bo);
|
String checkPostCodeUnique(SysPostBo post);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过岗位ID查询岗位使用数量
|
* 通过岗位ID查询岗位使用数量
|
||||||
|
|||||||
@ -17,15 +17,15 @@ import java.util.Set;
|
|||||||
public interface ISysRoleService {
|
public interface ISysRoleService {
|
||||||
|
|
||||||
|
|
||||||
TableDataInfo<SysRoleVo> selectPageRoleList(SysRoleBo bo, PageQuery pageQuery);
|
TableDataInfo<SysRoleVo> selectPageRoleList(SysRoleBo role, PageQuery pageQuery);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据条件分页查询角色数据
|
* 根据条件分页查询角色数据
|
||||||
*
|
*
|
||||||
* @param bo 角色信息
|
* @param role 角色信息
|
||||||
* @return 角色数据集合信息
|
* @return 角色数据集合信息
|
||||||
*/
|
*/
|
||||||
List<SysRoleVo> selectRoleList(SysRoleBo bo);
|
List<SysRoleVo> selectRoleList(SysRoleBo role);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据用户ID查询角色列表
|
* 根据用户ID查询角色列表
|
||||||
@ -69,25 +69,25 @@ public interface ISysRoleService {
|
|||||||
/**
|
/**
|
||||||
* 校验角色名称是否唯一
|
* 校验角色名称是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 角色信息
|
* @param role 角色信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
String checkRoleNameUnique(SysRoleBo bo);
|
String checkRoleNameUnique(SysRoleBo role);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验角色权限是否唯一
|
* 校验角色权限是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 角色信息
|
* @param role 角色信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
String checkRoleKeyUnique(SysRoleBo bo);
|
String checkRoleKeyUnique(SysRoleBo role);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验角色是否允许操作
|
* 校验角色是否允许操作
|
||||||
*
|
*
|
||||||
* @param bo 角色信息
|
* @param role 角色信息
|
||||||
*/
|
*/
|
||||||
void checkRoleAllowed(SysRoleBo bo);
|
void checkRoleAllowed(SysRoleBo role);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验角色是否有数据权限
|
* 校验角色是否有数据权限
|
||||||
|
|||||||
@ -42,8 +42,8 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
|
|||||||
private final SysConfigMapper baseMapper;
|
private final SysConfigMapper baseMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TableDataInfo<SysConfigVo> selectPageConfigList(SysConfigBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysConfigVo> selectPageConfigList(SysConfigBo config, PageQuery pageQuery) {
|
||||||
LambdaQueryWrapper<SysConfig> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysConfig> lqw = buildQueryWrapper(config);
|
||||||
Page<SysConfigVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
Page<SysConfigVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||||
return TableDataInfo.build(page);
|
return TableDataInfo.build(page);
|
||||||
}
|
}
|
||||||
@ -94,12 +94,12 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
|
|||||||
/**
|
/**
|
||||||
* 查询参数配置列表
|
* 查询参数配置列表
|
||||||
*
|
*
|
||||||
* @param bo 参数配置信息
|
* @param config 参数配置信息
|
||||||
* @return 参数配置集合
|
* @return 参数配置集合
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<SysConfigVo> selectConfigList(SysConfigBo bo) {
|
public List<SysConfigVo> selectConfigList(SysConfigBo config) {
|
||||||
LambdaQueryWrapper<SysConfig> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysConfig> lqw = buildQueryWrapper(config);
|
||||||
return baseMapper.selectVoList(lqw);
|
return baseMapper.selectVoList(lqw);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -205,13 +205,13 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
|
|||||||
/**
|
/**
|
||||||
* 校验参数键名是否唯一
|
* 校验参数键名是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 参数配置信息
|
* @param config 参数配置信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String checkConfigKeyUnique(SysConfigBo bo) {
|
public String checkConfigKeyUnique(SysConfigBo config) {
|
||||||
long configId = ObjectUtil.isNull(bo.getConfigId()) ? -1L : bo.getConfigId();
|
long configId = ObjectUtil.isNull(config.getConfigId()) ? -1L : config.getConfigId();
|
||||||
SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, bo.getConfigKey()));
|
SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, config.getConfigKey()));
|
||||||
if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) {
|
if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) {
|
||||||
return UserConstants.NOT_UNIQUE;
|
return UserConstants.NOT_UNIQUE;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -46,12 +46,12 @@ public class SysDeptServiceImpl implements ISysDeptService {
|
|||||||
/**
|
/**
|
||||||
* 查询部门管理数据
|
* 查询部门管理数据
|
||||||
*
|
*
|
||||||
* @param bo 部门信息
|
* @param dept 部门信息
|
||||||
* @return 部门信息集合
|
* @return 部门信息集合
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<SysDeptVo> selectDeptList(SysDeptBo bo) {
|
public List<SysDeptVo> selectDeptList(SysDeptBo dept) {
|
||||||
LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(dept);
|
||||||
return baseMapper.selectDeptList(lqw);
|
return baseMapper.selectDeptList(lqw);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -166,15 +166,15 @@ public class SysDeptServiceImpl implements ISysDeptService {
|
|||||||
/**
|
/**
|
||||||
* 校验部门名称是否唯一
|
* 校验部门名称是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 部门信息
|
* @param dept 部门信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String checkDeptNameUnique(SysDeptBo bo) {
|
public String checkDeptNameUnique(SysDeptBo dept) {
|
||||||
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDept>()
|
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDept>()
|
||||||
.eq(SysDept::getDeptName, bo.getDeptName())
|
.eq(SysDept::getDeptName, dept.getDeptName())
|
||||||
.eq(SysDept::getParentId, bo.getParentId())
|
.eq(SysDept::getParentId, dept.getParentId())
|
||||||
.ne(ObjectUtil.isNotNull(bo.getDeptId()), SysDept::getDeptId, bo.getDeptId()));
|
.ne(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId()));
|
||||||
if (exist) {
|
if (exist) {
|
||||||
return UserConstants.NOT_UNIQUE;
|
return UserConstants.NOT_UNIQUE;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,8 +33,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
|
|||||||
private final SysDictDataMapper baseMapper;
|
private final SysDictDataMapper baseMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TableDataInfo<SysDictDataVo> selectPageDictDataList(SysDictDataBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysDictDataVo> selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) {
|
||||||
LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(dictData);
|
||||||
Page<SysDictDataVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
Page<SysDictDataVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||||
return TableDataInfo.build(page);
|
return TableDataInfo.build(page);
|
||||||
}
|
}
|
||||||
@ -42,12 +42,12 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
|
|||||||
/**
|
/**
|
||||||
* 根据条件分页查询字典数据
|
* 根据条件分页查询字典数据
|
||||||
*
|
*
|
||||||
* @param bo 字典数据信息
|
* @param dictData 字典数据信息
|
||||||
* @return 字典数据集合信息
|
* @return 字典数据集合信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<SysDictDataVo> selectDictDataList(SysDictDataBo bo) {
|
public List<SysDictDataVo> selectDictDataList(SysDictDataBo dictData) {
|
||||||
LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(dictData);
|
||||||
return baseMapper.selectVoList(lqw);
|
return baseMapper.selectVoList(lqw);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -49,8 +49,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
|
|||||||
private final SysDictDataMapper dictDataMapper;
|
private final SysDictDataMapper dictDataMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TableDataInfo<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) {
|
||||||
LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(dictType);
|
||||||
Page<SysDictTypeVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
Page<SysDictTypeVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||||
return TableDataInfo.build(page);
|
return TableDataInfo.build(page);
|
||||||
}
|
}
|
||||||
@ -58,12 +58,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
|
|||||||
/**
|
/**
|
||||||
* 根据条件分页查询字典类型
|
* 根据条件分页查询字典类型
|
||||||
*
|
*
|
||||||
* @param bo 字典类型信息
|
* @param dictType 字典类型信息
|
||||||
* @return 字典类型集合信息
|
* @return 字典类型集合信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<SysDictTypeVo> selectDictTypeList(SysDictTypeBo bo) {
|
public List<SysDictTypeVo> selectDictTypeList(SysDictTypeBo dictType) {
|
||||||
LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(dictType);
|
||||||
return baseMapper.selectVoList(lqw);
|
return baseMapper.selectVoList(lqw);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -219,14 +219,14 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
|
|||||||
/**
|
/**
|
||||||
* 校验字典类型称是否唯一
|
* 校验字典类型称是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 字典类型
|
* @param dictType 字典类型
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String checkDictTypeUnique(SysDictTypeBo bo) {
|
public String checkDictTypeUnique(SysDictTypeBo dictType) {
|
||||||
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDictType>()
|
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDictType>()
|
||||||
.eq(SysDictType::getDictType, bo.getDictType())
|
.eq(SysDictType::getDictType, dictType.getDictType())
|
||||||
.ne(ObjectUtil.isNotNull(bo.getDictId()), SysDictType::getDictId, bo.getDictId()));
|
.ne(ObjectUtil.isNotNull(dictType.getDictId()), SysDictType::getDictId, dictType.getDictId()));
|
||||||
if (exist) {
|
if (exist) {
|
||||||
return UserConstants.NOT_UNIQUE;
|
return UserConstants.NOT_UNIQUE;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -288,15 +288,15 @@ public class SysMenuServiceImpl implements ISysMenuService {
|
|||||||
/**
|
/**
|
||||||
* 校验菜单名称是否唯一
|
* 校验菜单名称是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 菜单信息
|
* @param menu 菜单信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String checkMenuNameUnique(SysMenuBo bo) {
|
public String checkMenuNameUnique(SysMenuBo menu) {
|
||||||
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysMenu>()
|
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysMenu>()
|
||||||
.eq(SysMenu::getMenuName, bo.getMenuName())
|
.eq(SysMenu::getMenuName, menu.getMenuName())
|
||||||
.eq(SysMenu::getParentId, bo.getParentId())
|
.eq(SysMenu::getParentId, menu.getParentId())
|
||||||
.ne(ObjectUtil.isNotNull(bo.getMenuId()), SysMenu::getMenuId, bo.getMenuId()));
|
.ne(ObjectUtil.isNotNull(menu.getMenuId()), SysMenu::getMenuId, menu.getMenuId()));
|
||||||
if (exist) {
|
if (exist) {
|
||||||
return UserConstants.NOT_UNIQUE;
|
return UserConstants.NOT_UNIQUE;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -31,8 +31,8 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
|
|||||||
private final SysNoticeMapper baseMapper;
|
private final SysNoticeMapper baseMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TableDataInfo<SysNoticeVo> selectPageNoticeList(SysNoticeBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) {
|
||||||
LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(notice);
|
||||||
Page<SysNoticeVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
Page<SysNoticeVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||||
return TableDataInfo.build(page);
|
return TableDataInfo.build(page);
|
||||||
}
|
}
|
||||||
@ -51,12 +51,12 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
|
|||||||
/**
|
/**
|
||||||
* 查询公告列表
|
* 查询公告列表
|
||||||
*
|
*
|
||||||
* @param bo 公告信息
|
* @param notice 公告信息
|
||||||
* @return 公告集合
|
* @return 公告集合
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<SysNoticeVo> selectNoticeList(SysNoticeBo bo) {
|
public List<SysNoticeVo> selectNoticeList(SysNoticeBo notice) {
|
||||||
LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(notice);
|
||||||
return baseMapper.selectVoList(lqw);
|
return baseMapper.selectVoList(lqw);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -37,8 +37,8 @@ public class SysPostServiceImpl implements ISysPostService {
|
|||||||
private final SysUserPostMapper userPostMapper;
|
private final SysUserPostMapper userPostMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TableDataInfo<SysPostVo> selectPagePostList(SysPostBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysPostVo> selectPagePostList(SysPostBo post, PageQuery pageQuery) {
|
||||||
LambdaQueryWrapper<SysPost> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysPost> lqw = buildQueryWrapper(post);
|
||||||
Page<SysPostVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
Page<SysPostVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||||
return TableDataInfo.build(page);
|
return TableDataInfo.build(page);
|
||||||
}
|
}
|
||||||
@ -46,12 +46,12 @@ public class SysPostServiceImpl implements ISysPostService {
|
|||||||
/**
|
/**
|
||||||
* 查询岗位信息集合
|
* 查询岗位信息集合
|
||||||
*
|
*
|
||||||
* @param bo 岗位信息
|
* @param post 岗位信息
|
||||||
* @return 岗位信息集合
|
* @return 岗位信息集合
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<SysPostVo> selectPostList(SysPostBo bo) {
|
public List<SysPostVo> selectPostList(SysPostBo post) {
|
||||||
LambdaQueryWrapper<SysPost> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysPost> lqw = buildQueryWrapper(post);
|
||||||
return baseMapper.selectVoList(lqw);
|
return baseMapper.selectVoList(lqw);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -99,14 +99,14 @@ public class SysPostServiceImpl implements ISysPostService {
|
|||||||
/**
|
/**
|
||||||
* 校验岗位名称是否唯一
|
* 校验岗位名称是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 岗位信息
|
* @param post 岗位信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String checkPostNameUnique(SysPostBo bo) {
|
public String checkPostNameUnique(SysPostBo post) {
|
||||||
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysPost>()
|
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysPost>()
|
||||||
.eq(SysPost::getPostName, bo.getPostName())
|
.eq(SysPost::getPostName, post.getPostName())
|
||||||
.ne(ObjectUtil.isNotNull(bo.getPostId()), SysPost::getPostId, bo.getPostId()));
|
.ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId()));
|
||||||
if (exist) {
|
if (exist) {
|
||||||
return UserConstants.NOT_UNIQUE;
|
return UserConstants.NOT_UNIQUE;
|
||||||
}
|
}
|
||||||
@ -116,14 +116,14 @@ public class SysPostServiceImpl implements ISysPostService {
|
|||||||
/**
|
/**
|
||||||
* 校验岗位编码是否唯一
|
* 校验岗位编码是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 岗位信息
|
* @param post 岗位信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String checkPostCodeUnique(SysPostBo bo) {
|
public String checkPostCodeUnique(SysPostBo post) {
|
||||||
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysPost>()
|
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysPost>()
|
||||||
.eq(SysPost::getPostCode, bo.getPostCode())
|
.eq(SysPost::getPostCode, post.getPostCode())
|
||||||
.ne(ObjectUtil.isNotNull(bo.getPostId()), SysPost::getPostId, bo.getPostId()));
|
.ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId()));
|
||||||
if (exist) {
|
if (exist) {
|
||||||
return UserConstants.NOT_UNIQUE;
|
return UserConstants.NOT_UNIQUE;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,20 +47,20 @@ public class SysRoleServiceImpl implements ISysRoleService {
|
|||||||
private final SysRoleDeptMapper roleDeptMapper;
|
private final SysRoleDeptMapper roleDeptMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TableDataInfo<SysRoleVo> selectPageRoleList(SysRoleBo bo, PageQuery pageQuery) {
|
public TableDataInfo<SysRoleVo> selectPageRoleList(SysRoleBo role, PageQuery pageQuery) {
|
||||||
Page<SysRoleVo> page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(bo));
|
Page<SysRoleVo> page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role));
|
||||||
return TableDataInfo.build(page);
|
return TableDataInfo.build(page);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据条件分页查询角色数据
|
* 根据条件分页查询角色数据
|
||||||
*
|
*
|
||||||
* @param bo 角色信息
|
* @param role 角色信息
|
||||||
* @return 角色数据集合信息
|
* @return 角色数据集合信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<SysRoleVo> selectRoleList(SysRoleBo bo) {
|
public List<SysRoleVo> selectRoleList(SysRoleBo role) {
|
||||||
return baseMapper.selectRoleList(this.buildQueryWrapper(bo));
|
return baseMapper.selectRoleList(this.buildQueryWrapper(role));
|
||||||
}
|
}
|
||||||
|
|
||||||
private Wrapper<SysRole> buildQueryWrapper(SysRoleBo bo) {
|
private Wrapper<SysRole> buildQueryWrapper(SysRoleBo bo) {
|
||||||
@ -151,14 +151,14 @@ public class SysRoleServiceImpl implements ISysRoleService {
|
|||||||
/**
|
/**
|
||||||
* 校验角色名称是否唯一
|
* 校验角色名称是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 角色信息
|
* @param role 角色信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String checkRoleNameUnique(SysRoleBo bo) {
|
public String checkRoleNameUnique(SysRoleBo role) {
|
||||||
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
|
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
|
||||||
.eq(SysRole::getRoleName, bo.getRoleName())
|
.eq(SysRole::getRoleName, role.getRoleName())
|
||||||
.ne(ObjectUtil.isNotNull(bo.getRoleId()), SysRole::getRoleId, bo.getRoleId()));
|
.ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId()));
|
||||||
if (exist) {
|
if (exist) {
|
||||||
return UserConstants.NOT_UNIQUE;
|
return UserConstants.NOT_UNIQUE;
|
||||||
}
|
}
|
||||||
@ -168,14 +168,14 @@ public class SysRoleServiceImpl implements ISysRoleService {
|
|||||||
/**
|
/**
|
||||||
* 校验角色权限是否唯一
|
* 校验角色权限是否唯一
|
||||||
*
|
*
|
||||||
* @param bo 角色信息
|
* @param role 角色信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String checkRoleKeyUnique(SysRoleBo bo) {
|
public String checkRoleKeyUnique(SysRoleBo role) {
|
||||||
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
|
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
|
||||||
.eq(SysRole::getRoleKey, bo.getRoleKey())
|
.eq(SysRole::getRoleKey, role.getRoleKey())
|
||||||
.ne(ObjectUtil.isNotNull(bo.getRoleId()), SysRole::getRoleId, bo.getRoleId()));
|
.ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId()));
|
||||||
if (exist) {
|
if (exist) {
|
||||||
return UserConstants.NOT_UNIQUE;
|
return UserConstants.NOT_UNIQUE;
|
||||||
}
|
}
|
||||||
@ -185,11 +185,11 @@ public class SysRoleServiceImpl implements ISysRoleService {
|
|||||||
/**
|
/**
|
||||||
* 校验角色是否允许操作
|
* 校验角色是否允许操作
|
||||||
*
|
*
|
||||||
* @param bo 角色信息
|
* @param role 角色信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void checkRoleAllowed(SysRoleBo bo) {
|
public void checkRoleAllowed(SysRoleBo role) {
|
||||||
if (ObjectUtil.isNotNull(bo.getRoleId()) && bo.isAdmin()) {
|
if (ObjectUtil.isNotNull(role.getRoleId()) && role.isAdmin()) {
|
||||||
throw new ServiceException("不允许操作超级管理员角色");
|
throw new ServiceException("不允许操作超级管理员角色");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user