From 744aeef761e5039ff9dcffb9a7080bbdb142bd31 Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Thu, 13 Feb 2025 23:02:21 +0800 Subject: [PATCH] =?UTF-8?q?feat()=EF=BC=9A=E5=AD=97=E5=85=B8=E3=80=81?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E3=80=81=E7=94=A8=E6=88=B7=E7=AD=89=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=B8=9A=E5=8A=A1=E4=BD=BF=E7=94=A8MyBatis-Plus?= =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=8C=E5=AE=8C=E6=88=90=E5=BA=A6=2040%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/gen/mapper/GenTableColumnMapper.java | 2 +- .../com/muyu/gen/mapper/GenTableMapper.java | 2 +- .../muyu/gen/service/GenTableServiceImpl.java | 2 +- .../muyu/gen/service/IGenTableService.java | 2 +- .../controller/SysLogininforController.java | 8 +- .../system/controller/SysMenuController.java | 9 +- .../controller/SysNoticeController.java | 26 ++-- .../controller/SysProfileController.java | 39 ++--- .../system/controller/SysRoleController.java | 35 +++-- .../system/controller/SysUserController.java | 60 +++---- .../system/mapper/SysLogininforMapper.java | 23 --- .../com/muyu/system/mapper/SysMenuMapper.java | 70 --------- .../muyu/system/mapper/SysNoticeMapper.java | 53 ------- .../muyu/system/mapper/SysOperLogMapper.java | 33 ---- .../com/muyu/system/mapper/SysPostMapper.java | 70 --------- .../muyu/system/mapper/SysRoleDeptMapper.java | 34 ---- .../com/muyu/system/mapper/SysRoleMapper.java | 2 +- .../muyu/system/mapper/SysRoleMenuMapper.java | 38 ----- .../com/muyu/system/mapper/SysUserMapper.java | 82 ---------- .../muyu/system/mapper/SysUserPostMapper.java | 34 ---- .../muyu/system/mapper/SysUserRoleMapper.java | 53 ------- .../muyu/system/service/SysConfigService.java | 1 + .../system/service/SysDictDataService.java | 2 +- .../system/service/SysDictTypeService.java | 2 +- .../system/service/SysLogininforService.java | 4 +- .../muyu/system/service/SysMenuService.java | 14 +- .../muyu/system/service/SysNoticeService.java | 27 ++-- .../system/service/SysOperLogService.java | 16 +- .../muyu/system/service/SysPostService.java | 19 +-- .../system/service/SysRoleDeptService.java | 28 ++++ .../system/service/SysRoleMenuService.java | 35 +++++ .../muyu/system/service/SysRoleService.java | 16 +- .../system/service/SysUserPostService.java | 34 ++++ .../system/service/SysUserRoleService.java | 59 +++++++ .../muyu/system/service/SysUserService.java | 52 +++---- .../service/impl/SysConfigServiceImpl.java | 1 + .../service/impl/SysDictDataServiceImpl.java | 2 +- .../service/impl/SysDictTypeServiceImpl.java | 2 +- .../impl/SysLogininforServiceImpl.java | 8 +- .../service/impl/SysMenuServiceImpl.java | 61 ++++---- .../service/impl/SysNoticeServiceImpl.java | 54 +++---- .../service/impl/SysOperLogServiceImpl.java | 83 +++++----- .../service/impl/SysPostServiceImpl.java | 53 +++---- .../service/impl/SysRoleDeptServiceImpl.java | 44 ++++++ .../service/impl/SysRoleMenuServiceImpl.java | 58 +++++++ .../service/impl/SysRoleServiceImpl.java | 68 ++++---- .../service/impl/SysUserPostServiceImpl.java | 58 +++++++ .../service/impl/SysUserRoleServiceImpl.java | 92 +++++++++++ .../service/impl/SysUserServiceImpl.java | 147 ++++++++++-------- .../mapper/system/SysLogininforMapper.xml | 33 ---- .../resources/mapper/system/SysMenuMapper.xml | 109 ------------- .../mapper/system/SysNoticeMapper.xml | 66 -------- .../mapper/system/SysOperLogMapper.xml | 46 ------ .../mapper/system/SysRoleDeptMapper.xml | 26 ---- .../mapper/system/SysRoleMenuMapper.xml | 31 ---- .../resources/mapper/system/SysUserMapper.xml | 101 ------------ .../mapper/system/SysUserPostMapper.xml | 25 --- .../mapper/system/SysUserRoleMapper.xml | 40 ----- 58 files changed, 813 insertions(+), 1381 deletions(-) create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleDeptService.java create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleMenuService.java create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserPostService.java create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserRoleService.java create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleDeptServiceImpl.java create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleMenuServiceImpl.java create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserPostServiceImpl.java create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserRoleServiceImpl.java diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java index 5825d59..0eeda27 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java @@ -63,5 +63,5 @@ public interface GenTableColumnMapper extends BaseMapper { * * @return 结果 */ - int deleteGenTableColumnByIds (Long[] ids); + int deleteGenTableColumnByIds (List ids); } diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java index 66858cb..388eea9 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java @@ -88,5 +88,5 @@ public interface GenTableMapper extends BaseMapper { * * @return 结果 */ - int deleteGenTableByIds (Long[] ids); + int deleteGenTableByIds (List ids); } diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java index 6273779..85d70f7 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java @@ -158,7 +158,7 @@ public class GenTableServiceImpl implements IGenTableService { */ @Override @Transactional(rollbackFor = Exception.class) - public void deleteGenTableByIds (Long[] tableIds) { + public void deleteGenTableByIds (List tableIds) { genTableMapper.deleteGenTableByIds(tableIds); genTableColumnMapper.deleteGenTableColumnByIds(tableIds); } diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableService.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableService.java index f34dc37..e2e4c05 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableService.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableService.java @@ -70,7 +70,7 @@ public interface IGenTableService { * * @return 结果 */ - void deleteGenTableByIds (Long[] tableIds); + void deleteGenTableByIds (List tableIds); /** * 导入表结构 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index 5293796..e5f54cb 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java @@ -57,8 +57,9 @@ public class SysLogininforController extends BaseController { @RequiresPermissions("system:logininfor:remove") @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") - public Result remove (@PathVariable("infoIds") Long[] infoIds) { - return toAjax(logininforService.deleteLogininforByIds(infoIds)); + public Result remove (@PathVariable("infoIds") List infoIds) { + logininforService.deleteLogininforByIds(infoIds); + return Result.success(); } @RequiresPermissions("system:logininfor:remove") @@ -80,6 +81,7 @@ public class SysLogininforController extends BaseController { @InnerAuth @PostMapping public Result add (@RequestBody SysLogininfor logininfor) { - return toAjax(logininforService.insertLogininfor(logininfor)); + logininforService.insertLogininfor(logininfor); + return Result.success(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index 5f055b8..256ba61 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -86,7 +86,8 @@ public class SysMenuController extends BaseController { return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); } menu.setCreateBy(SecurityUtils.getUsername()); - return toAjax(menuService.insertMenu(menu)); + menuService.insertMenu(menu); + return Result.success(); } /** @@ -104,7 +105,8 @@ public class SysMenuController extends BaseController { return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); } menu.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(menuService.updateMenu(menu)); + menuService.updateMenu(menu); + return Result.success(); } /** @@ -120,7 +122,8 @@ public class SysMenuController extends BaseController { if (menuService.checkMenuExistRole(menuId)) { return warn("菜单已分配,不允许删除"); } - return toAjax(menuService.deleteMenuById(menuId)); + menuService.deleteMenuById(menuId); + return Result.success(); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java index eb29bfa..bfeb03d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java @@ -3,11 +3,14 @@ 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.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.SysNotice; +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,9 +34,11 @@ public class SysNoticeController extends BaseController { */ @RequiresPermissions("system:notice:list") @PostMapping("/list") - public Result> list (@RequestBody SysNotice notice) { - List list = noticeService.selectNoticeList(notice); - return Result.success(new DataPageResp<>(0,list)); + public Result> list (@RequestBody SysNoticeListReq sysNoticeListReq) { + PageQueryModel sysNoticePageQueryModel = noticeService.pageQuery(SysNoticePageQueryModel.reqBuild(sysNoticeListReq)); + return Result.success( + DataPageResp.of(sysNoticePageQueryModel) + ); } /** @@ -51,9 +56,10 @@ public class SysNoticeController extends BaseController { @RequiresPermissions("system:notice:add") @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysNotice notice) { + public Result add (@Validated @RequestBody SysNotice notice) { notice.setCreateBy(SecurityUtils.getUsername()); - return toAjax(noticeService.insertNotice(notice)); + noticeService.insertNotice(notice); + return Result.success(); } /** @@ -62,9 +68,10 @@ public class SysNoticeController extends BaseController { @RequiresPermissions("system:notice:edit") @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysNotice notice) { + public Result edit (@Validated @RequestBody SysNotice notice) { notice.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(noticeService.updateNotice(notice)); + noticeService.updateNotice(notice); + return Result.success(); } /** @@ -73,7 +80,8 @@ public class SysNoticeController extends BaseController { @RequiresPermissions("system:notice:remove") @Log(title = "通知公告", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") - public Result remove (@PathVariable("noticeIds") Long[] noticeIds) { - return toAjax(noticeService.deleteNoticeByIds(noticeIds)); + public Result remove (@PathVariable("noticeIds") List noticeIds) { + noticeService.deleteNoticeByIds(noticeIds); + return Result.success(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java index ae49255..fbc5987 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java @@ -59,7 +59,7 @@ public class SysProfileController extends BaseController { */ @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping - public Result updateProfile (@RequestBody SysUser user) { + public Result updateProfile (@RequestBody SysUser user) { LoginUser loginUser = SecurityUtils.getLoginUser(); SysUser currentUser = loginUser.getSysUser(); currentUser.setNickName(user.getNickName()); @@ -72,12 +72,10 @@ public class SysProfileController extends BaseController { if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser)) { return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } - if (userService.updateUserProfile(currentUser) > 0) { - // 更新缓存用户信息 - tokenService.setLoginUser(loginUser); - return success(); - } - return error("修改个人信息异常，请联系管理员"); + userService.updateUserProfile(currentUser); + // 更新缓存用户信息 + tokenService.setLoginUser(loginUser); + return Result.success(); } /** @@ -85,7 +83,7 @@ public class SysProfileController extends BaseController { */ @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") - public Result updatePwd (String oldPassword, String newPassword) { + public Result updatePwd (String oldPassword, String newPassword) { String username = SecurityUtils.getUsername(); SysUser user = userService.selectUserByUserName(username); String password = user.getPassword(); @@ -95,14 +93,12 @@ public class SysProfileController extends BaseController { if (SecurityUtils.matchesPassword(newPassword, password)) { return error("新密码不能与旧密码相同"); } - if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) { - // 更新缓存用户密码 - LoginUser loginUser = SecurityUtils.getLoginUser(); - loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword)); - tokenService.setLoginUser(loginUser); - return success(); - } - return error("修改密码异常，请联系管理员"); + userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)); + // 更新缓存用户密码 + LoginUser loginUser = SecurityUtils.getLoginUser(); + loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword)); + tokenService.setLoginUser(loginUser); + return Result.success(); } /** @@ -122,12 +118,11 @@ public class SysProfileController extends BaseController { return error("文件服务异常，请联系管理员"); } String url = fileResult.getData().getUrl(); - if (userService.updateUserAvatar(loginUser.getUsername(), url)) { - // 更新缓存用户头像 - loginUser.getSysUser().setAvatar(url); - tokenService.setLoginUser(loginUser); - return Result.success(url); - } + userService.updateUserAvatar(loginUser.getUsername(), url); + // 更新缓存用户头像 + loginUser.getSysUser().setAvatar(url); + tokenService.setLoginUser(loginUser); + return Result.success(url); } return error("上传图片异常，请联系管理员"); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java index 9c45f4c..4f7e1fa 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -8,7 +8,6 @@ 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.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysUserRole; @@ -72,7 +71,7 @@ public class SysRoleController extends BaseController { @RequiresPermissions("system:role:add") @Log(title = "角色管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysRole role) { + public Result add (@Validated @RequestBody SysRole role) { if (!roleService.checkRoleNameUnique(role)) { return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); } else if (!roleService.checkRoleKeyUnique(role)) { @@ -107,10 +106,11 @@ public class SysRoleController extends BaseController { @RequiresPermissions("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") - public Result dataScope (@RequestBody SysRole role) { + public Result dataScope (@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); - return toAjax(roleService.authDataScope(role)); + roleService.authDataScope(role); + return Result.success(); } /** @@ -119,11 +119,12 @@ public class SysRoleController extends BaseController { @RequiresPermissions("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public Result changeStatus (@RequestBody SysRole role) { + public Result changeStatus (@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); role.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(roleService.updateRoleStatus(role)); + roleService.updateRoleStatus(role); + return Result.success(); } /** @@ -132,8 +133,9 @@ public class SysRoleController extends BaseController { @RequiresPermissions("system:role:remove") @Log(title = "角色管理", businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") - public Result remove (@PathVariable("roleIds") Long[] roleIds) { - return toAjax(roleService.deleteRoleByIds(roleIds)); + public Result remove (@PathVariable("roleIds") List roleIds) { + roleService.deleteRoleByIds(roleIds); + return Result.success(); } /** @@ -141,7 +143,7 @@ public class SysRoleController extends BaseController { */ @RequiresPermissions("system:role:query") @GetMapping("/optionselect") - public Result optionselect () { + public Result> optionselect () { return success(roleService.selectRoleAll()); } @@ -172,7 +174,8 @@ public class SysRoleController extends BaseController { @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") public Result cancelAuthUser (@RequestBody SysUserRole userRole) { - return toAjax(roleService.deleteAuthUser(userRole)); + roleService.deleteAuthUser(userRole); + return Result.success(); } /** @@ -181,8 +184,9 @@ public class SysRoleController extends BaseController { @RequiresPermissions("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancelAll") - public Result cancelAuthUserAll (Long roleId, Long[] userIds) { - return toAjax(roleService.deleteAuthUsers(roleId, userIds)); + public Result cancelAuthUserAll (Long roleId, List userIds) { + roleService.deleteAuthUsers(roleId, userIds); + return Result.success(); } /** @@ -191,9 +195,10 @@ public class SysRoleController extends BaseController { @RequiresPermissions("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/selectAll") - public Result selectAuthUserAll (Long roleId, Long[] userIds) { + public Result selectAuthUserAll (Long roleId, List userIds) { roleService.checkRoleDataScope(roleId); - return toAjax(roleService.insertAuthUsers(roleId, userIds)); + roleService.insertAuthUsers(roleId, userIds); + return Result.success(); } /** @@ -201,7 +206,7 @@ public class SysRoleController extends BaseController { */ @RequiresPermissions("system:role:query") @GetMapping(value = "/deptTree/{roleId}") - public Result deptTree (@PathVariable("roleId") Long roleId) { + public Result deptTree (@PathVariable("roleId") Long roleId) { return Result.success( DeptTreeResp.builder() .depts(deptService.selectDeptTreeList()) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index 54a14de..14c9cf4 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -10,22 +10,20 @@ 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.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.common.system.domain.LoginUser; import com.muyu.system.domain.resp.AuthRoleResp; import com.muyu.system.domain.resp.UserDetailInfoResp; import com.muyu.system.domain.resp.UserInfoResp; +import com.muyu.system.domain.vo.TreeSelect; import com.muyu.system.service.*; -import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -71,15 +69,15 @@ public class SysUserController extends BaseController { @PostMapping("/export") public void export (HttpServletResponse response, SysUser user) { List list = userService.selectUserList(user); - ExcelUtil util = new ExcelUtil(SysUser.class); + ExcelUtil util = new ExcelUtil<>(SysUser.class); util.exportExcel(response, list, "用户数据"); } @Log(title = "用户管理", businessType = BusinessType.IMPORT) @RequiresPermissions("system:user:import") @PostMapping("/importData") - public Result importData (MultipartFile file, boolean updateSupport) throws Exception { - ExcelUtil util = new ExcelUtil(SysUser.class); + public Result importData (MultipartFile file, boolean updateSupport) throws Exception { + ExcelUtil util = new ExcelUtil<>(SysUser.class); List userList = util.importExcel(file.getInputStream()); String operName = SecurityUtils.getUsername(); String message = userService.importUser(userList, updateSupport, operName); @@ -87,8 +85,8 @@ public class SysUserController extends BaseController { } @PostMapping("/importTemplate") - public void importTemplate (HttpServletResponse response) throws IOException { - ExcelUtil util = new ExcelUtil(SysUser.class); + public void importTemplate (HttpServletResponse response) { + ExcelUtil util = new ExcelUtil<>(SysUser.class); util.importTemplateExcel(response, "用户数据"); } @@ -123,10 +121,11 @@ public class SysUserController extends BaseController { if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { return Result.error("当前系统没有开启注册功能！"); } - if (!userService.checkUserNameUnique(sysUser)) { + if (userService.checkUserNameUnique(sysUser)) { return Result.error("保存用户'" + username + "'失败，注册账号已存在"); } - return Result.success(userService.registerUser(sysUser)); + userService.registerUser(sysUser); + return Result.success(); } /** @@ -135,7 +134,7 @@ public class SysUserController extends BaseController { * @return 用户信息 */ @GetMapping("/getInfo") - public Result getInfo () { + public Result getInfo () { SysUser user = userService.selectUserById(SecurityUtils.getUserId()); // 角色集合 Set roles = permissionService.getRolePermission(user); @@ -156,7 +155,7 @@ public class SysUserController extends BaseController { */ @RequiresPermissions("system:user:query") @GetMapping(value = {"/", "/{userId}"}) - public Result getInfo (@PathVariable(value = "userId", required = false) Long userId) { + public Result getInfo (@PathVariable(value = "userId", required = false) Long userId) { userService.checkUserDataScope(userId); UserDetailInfoResp.UserDetailInfoRespBuilder builder = UserDetailInfoResp.builder(); List roles = roleService.selectRoleAll(); @@ -180,8 +179,8 @@ public class SysUserController extends BaseController { @RequiresPermissions("system:user:add") @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysUser user) { - if (!userService.checkUserNameUnique(user)) { + public Result add (@Validated @RequestBody SysUser user) { + if (userService.checkUserNameUnique(user)) { return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); @@ -190,7 +189,8 @@ public class SysUserController extends BaseController { } user.setCreateBy(SecurityUtils.getUsername()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - return toAjax(userService.insertUser(user)); + userService.insertUser(user); + return Result.success(); } /** @@ -199,10 +199,10 @@ public class SysUserController extends BaseController { @RequiresPermissions("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping - public Result edit (@Validated @RequestBody SysUser user) { + public Result edit (@Validated @RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); - if (!userService.checkUserNameUnique(user)) { + if (userService.checkUserNameUnique(user)) { return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在"); } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); @@ -210,7 +210,8 @@ public class SysUserController extends BaseController { return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.updateUser(user)); + userService.updateUser(user); + return Result.success(); } /** @@ -219,11 +220,12 @@ public class SysUserController extends BaseController { @RequiresPermissions("system:user:remove") @Log(title = "用户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") - public Result remove (@PathVariable("userIds") Long[] userIds) { - if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) { + public Result remove (@PathVariable("userIds") List userIds) { + if (userIds.contains(SecurityUtils.getUserId())) { return error("当前用户不能删除"); } - return toAjax(userService.deleteUserByIds(userIds)); + userService.deleteUserByIds(userIds); + return Result.success(); } /** @@ -232,12 +234,13 @@ public class SysUserController extends BaseController { @RequiresPermissions("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") - public Result resetPwd (@RequestBody SysUser user) { + public Result resetPwd (@RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.resetPwd(user)); + userService.resetPwd(user); + return Result.success(); } /** @@ -246,11 +249,12 @@ public class SysUserController extends BaseController { @RequiresPermissions("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public Result changeStatus (@RequestBody SysUser user) { + public Result changeStatus (@RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.updateUserStatus(user)); + userService.updateUserStatus(user); + return Result.success(); } /** @@ -258,7 +262,7 @@ public class SysUserController extends BaseController { */ @RequiresPermissions("system:user:query") @GetMapping("/authRole/{userId}") - public Result authRole (@PathVariable("userId") Long userId) { + public Result authRole (@PathVariable("userId") Long userId) { SysUser user = userService.selectUserById(userId); List roles = roleService.selectRolesByUserId(userId); return Result.success( @@ -275,7 +279,7 @@ public class SysUserController extends BaseController { @RequiresPermissions("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.GRANT) @PutMapping("/authRole") - public Result insertAuthRole (Long userId, Long[] roleIds) { + public Result insertAuthRole (Long userId, Long[] roleIds) { userService.checkUserDataScope(userId); userService.insertUserAuth(userId, roleIds); return success(); @@ -286,7 +290,7 @@ public class SysUserController extends BaseController { */ @RequiresPermissions("system:user:list") @GetMapping("/deptTree") - public Result deptTree () { + public Result> deptTree () { return success(deptService.selectDeptTreeList()); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java index 0f1f86a..60a9c6f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java @@ -11,30 +11,7 @@ import java.util.List; * @author muyu */ public interface SysLogininforMapper extends BaseMapper { - /** - * 新增系统登录日志 - * - * @param logininfor 访问日志对象 - */ - public int insertLogininfor (SysLogininfor logininfor); - /** - * 查询系统登录日志集合 - * - * @param logininfor 访问日志对象 - * - * @return 登录记录集合 - */ - public List selectLogininforList (SysLogininfor logininfor); - - /** - * 批量删除系统登录日志 - * - * @param infoIds 需要删除的登录日志ID - * - * @return 结果 - */ - public int deleteLogininforByIds (Long[] infoIds); /** * 清空系统登录日志 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java index 8ceaaa0..4adab0a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java @@ -12,21 +12,6 @@ import java.util.List; * @author muyu */ public interface SysMenuMapper extends BaseMapper { - /** - * 查询系统菜单列表 - * - * @param menu 菜单信息 - * - * @return 菜单列表 - */ - public List selectMenuList (SysMenu menu); - - /** - * 根据用户所有权限 - * - * @return 权限列表 - */ - public List selectMenuPerms (); /** * 根据用户查询系统菜单列表 @@ -80,59 +65,4 @@ public interface SysMenuMapper extends BaseMapper { * @return 选中菜单列表 */ public List selectMenuListByRoleId (@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); - - /** - * 根据菜单ID查询信息 - * - * @param menuId 菜单ID - * - * @return 菜单信息 - */ - public SysMenu selectMenuById (Long menuId); - - /** - * 是否存在菜单子节点 - * - * @param menuId 菜单ID - * - * @return 结果 - */ - public int hasChildByMenuId (Long menuId); - - /** - * 新增菜单信息 - * - * @param menu 菜单信息 - * - * @return 结果 - */ - public int insertMenu (SysMenu menu); - - /** - * 修改菜单信息 - * - * @param menu 菜单信息 - * - * @return 结果 - */ - public int updateMenu (SysMenu menu); - - /** - * 删除菜单管理信息 - * - * @param menuId 菜单ID - * - * @return 结果 - */ - public int deleteMenuById (Long menuId); - - /** - * 校验菜单名称是否唯一 - * - * @param menuName 菜单名称 - * @param parentId 父菜单ID - * - * @return 结果 - */ - public SysMenu checkMenuNameUnique (@Param("menuName") String menuName, @Param("parentId") Long parentId); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java index fee9930..9d5475d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java @@ -11,57 +11,4 @@ import java.util.List; * @author muyu */ public interface SysNoticeMapper extends BaseMapper { - /** - * 查询公告信息 - * - * @param noticeId 公告ID - * - * @return 公告信息 - */ - public SysNotice selectNoticeById (Long noticeId); - - /** - * 查询公告列表 - * - * @param notice 公告信息 - * - * @return 公告集合 - */ - public List selectNoticeList (SysNotice notice); - - /** - * 新增公告 - * - * @param notice 公告信息 - * - * @return 结果 - */ - public int insertNotice (SysNotice notice); - - /** - * 修改公告 - * - * @param notice 公告信息 - * - * @return 结果 - */ - public int updateNotice (SysNotice notice); - - /** - * 批量删除公告 - * - * @param noticeId 公告ID - * - * @return 结果 - */ - public int deleteNoticeById (Long noticeId); - - /** - * 批量删除公告信息 - * - * @param noticeIds 需要删除的公告ID - * - * @return 结果 - */ - public int deleteNoticeByIds (Long[] noticeIds); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java index 6ea1bcd..347e67e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java @@ -11,39 +11,6 @@ import java.util.List; * @author muyu */ public interface SysOperLogMapper extends BaseMapper { - /** - * 新增操作日志 - * - * @param operLog 操作日志对象 - */ - public int insertOperlog (SysOperLog operLog); - - /** - * 查询系统操作日志集合 - * - * @param operLog 操作日志对象 - * - * @return 操作日志集合 - */ - public List selectOperLogList (SysOperLog operLog); - - /** - * 批量删除系统操作日志 - * - * @param operIds 需要删除的操作日志ID - * - * @return 结果 - */ - public int deleteOperLogByIds (Long[] operIds); - - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * - * @return 操作日志对象 - */ - public SysOperLog selectOperLogById (Long operId); /** * 清空操作日志 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java index 4bfd66d..f9f1f74 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java @@ -20,22 +20,6 @@ public interface SysPostMapper extends BaseMapper { */ public List selectPostList (SysPost post); - /** - * 查询所有岗位 - * - * @return 岗位列表 - */ - public List selectPostAll (); - - /** - * 通过岗位ID查询岗位信息 - * - * @param postId 岗位ID - * - * @return 角色对象信息 - */ - public SysPost selectPostById (Long postId); - /** * 根据用户ID获取岗位选择框列表 * @@ -53,58 +37,4 @@ public interface SysPostMapper extends BaseMapper { * @return 结果 */ public List selectPostsByUserName (String userName); - - /** - * 删除岗位信息 - * - * @param postId 岗位ID - * - * @return 结果 - */ - public int deletePostById (Long postId); - - /** - * 批量删除岗位信息 - * - * @param postIds 需要删除的岗位ID - * - * @return 结果 - */ - public int deletePostByIds (Long[] postIds); - - /** - * 修改岗位信息 - * - * @param post 岗位信息 - * - * @return 结果 - */ - public int updatePost (SysPost post); - - /** - * 新增岗位信息 - * - * @param post 岗位信息 - * - * @return 结果 - */ - public int insertPost (SysPost post); - - /** - * 校验岗位名称 - * - * @param postName 岗位名称 - * - * @return 结果 - */ - public SysPost checkPostNameUnique (String postName); - - /** - * 校验岗位编码 - * - * @param postCode 岗位编码 - * - * @return 结果 - */ - public SysPost checkPostCodeUnique (String postCode); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java index 0e6dd4d..24ee529 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java @@ -12,39 +12,5 @@ import java.util.List; * @author muyu */ public interface SysRoleDeptMapper extends BaseMapper { - /** - * 通过角色ID删除角色和部门关联 - * - * @param roleId 角色ID - * - * @return 结果 - */ - public int deleteRoleDeptByRoleId (Long roleId); - /** - * 批量删除角色部门关联信息 - * - * @param ids 需要删除的数据ID - * - * @return 结果 - */ - public int deleteRoleDept (Long[] ids); - - /** - * 查询部门使用数量 - * - * @param deptId 部门ID - * - * @return 结果 - */ - public int selectCountRoleDeptByDeptId (Long deptId); - - /** - * 批量新增角色部门信息 - * - * @param roleDeptList 角色部门列表 - * - * @return 结果 - */ - public int batchRoleDept (List roleDeptList); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java index 242a1a5..7b35aaa 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java @@ -100,5 +100,5 @@ public interface SysRoleMapper extends BaseMapper { * * @return 结果 */ - public int deleteRoleByIds (Long[] roleIds); + public int deleteRoleByIds (List roleIds); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java index 45847ae..7f5bd67 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java @@ -13,43 +13,5 @@ import java.util.List; * @author muyu */ public interface SysRoleMenuMapper extends BaseMapper { - /** - * 查询菜单使用数量 - * - * @param menuId 菜单ID - * - * @return 结果 - */ - public int checkMenuExistRole (Long menuId); - - /** - * 通过角色ID删除角色和菜单关联 - * - * @param roleId 角色ID - * - * @return 结果 - */ - public int deleteRoleMenuByRoleId (Long roleId); - - /** - * 批量删除角色菜单关联信息 - * - * @param ids 需要删除的数据ID - * - * @return 结果 - */ - public int deleteRoleMenu (Long[] ids); - - /** - * 批量新增角色菜单信息 - * - * @param roleMenuList 角色菜单列表 - * - * @return 结果 - */ - public int batchRoleMenu (List roleMenuList); - - // 批量保存角色与菜单的关联 - boolean saveBatch(@Param("roleMenuList") List roleMenuList); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java index e037b34..a40483a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java @@ -57,86 +57,4 @@ public interface SysUserMapper extends BaseMapper { */ public SysUser selectUserById (Long userId); - /** - * 新增用户信息 - * - * @param user 用户信息 - * - * @return 结果 - */ - public int insertUser (SysUser user); - - /** - * 修改用户信息 - * - * @param user 用户信息 - * - * @return 结果 - */ - public int updateUser (SysUser user); - - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * - * @return 结果 - */ - public int updateUserAvatar (@Param("userName") String userName, @Param("avatar") String avatar); - - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * - * @return 结果 - */ - public int resetUserPwd (@Param("userName") String userName, @Param("password") String password); - - /** - * 通过用户ID删除用户 - * - * @param userId 用户ID - * - * @return 结果 - */ - public int deleteUserById (Long userId); - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * - * @return 结果 - */ - public int deleteUserByIds (Long[] userIds); - - /** - * 校验用户名称是否唯一 - * - * @param userName 用户名称 - * - * @return 结果 - */ - public SysUser checkUserNameUnique (String userName); - - /** - * 校验手机号码是否唯一 - * - * @param phonenumber 手机号码 - * - * @return 结果 - */ - public SysUser checkPhoneUnique (String phonenumber); - - /** - * 校验email是否唯一 - * - * @param email 用户邮箱 - * - * @return 结果 - */ - public SysUser checkEmailUnique (String email); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java index 8d09a47..121c307 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java @@ -11,39 +11,5 @@ import java.util.List; * @author muyu */ public interface SysUserPostMapper extends BaseMapper { - /** - * 通过用户ID删除用户和岗位关联 - * - * @param userId 用户ID - * - * @return 结果 - */ - public int deleteUserPostByUserId (Long userId); - /** - * 通过岗位ID查询岗位使用数量 - * - * @param postId 岗位ID - * - * @return 结果 - */ - public int countUserPostById (Long postId); - - /** - * 批量删除用户和岗位关联 - * - * @param ids 需要删除的数据ID - * - * @return 结果 - */ - public int deleteUserPost (Long[] ids); - - /** - * 批量新增用户岗位信息 - * - * @param userPostList 用户角色列表 - * - * @return 结果 - */ - public int batchUserPost (List userPostList); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java index 512adb8..42f75e0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java @@ -12,58 +12,5 @@ import java.util.List; * @author muyu */ public interface SysUserRoleMapper extends BaseMapper { - /** - * 通过用户ID删除用户和角色关联 - * - * @param userId 用户ID - * - * @return 结果 - */ - public int deleteUserRoleByUserId (Long userId); - /** - * 批量删除用户和角色关联 - * - * @param ids 需要删除的数据ID - * - * @return 结果 - */ - public int deleteUserRole (Long[] ids); - - /** - * 通过角色ID查询角色使用数量 - * - * @param roleId 角色ID - * - * @return 结果 - */ - public int countUserRoleByRoleId (Long roleId); - - /** - * 批量新增用户角色信息 - * - * @param userRoleList 用户角色列表 - * - * @return 结果 - */ - public int batchUserRole (List userRoleList); - - /** - * 删除用户和角色关联信息 - * - * @param userRole 用户和角色关联信息 - * - * @return 结果 - */ - public int deleteUserRoleInfo (SysUserRole userRole); - - /** - * 批量取消授权用户角色 - * - * @param roleId 角色ID - * @param userIds 需要删除的用户数据ID - * - * @return 结果 - */ - public int deleteUserRoleInfos (@Param("roleId") Long roleId, @Param("userIds") Long[] userIds); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java index ca4ff4f..bb3ada7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -9,6 +9,7 @@ import com.muyu.system.domain.model.SysConfigPageQueryModel; import java.util.List; /** + * 系统配置业务层 * @author DongZl * @description: 配置plus业务层 * @Date 2023-11-13 上午 10:06 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java index cc904ac..259357f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java @@ -46,7 +46,7 @@ public interface SysDictDataService extends IService { * * @param dictCodes 需要删除的字典数据ID */ - public void deleteDictDataByIds (Long[] dictCodes); + public void deleteDictDataByIds (List dictCodes); /** * 新增保存字典数据信息 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java index 897ffac..283fdd1 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java @@ -62,7 +62,7 @@ public interface SysDictTypeService extends IService { * * @param dictIds 需要删除的字典ID */ - public void deleteDictTypeByIds (Long[] dictIds); + public void deleteDictTypeByIds (List dictIds); /** * 加载字典缓存数据 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java index 92819a9..cedc60f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java @@ -19,7 +19,7 @@ public interface SysLogininforService extends IService { * * @param logininfor 访问日志对象 */ - public int insertLogininfor (SysLogininfor logininfor); + public void insertLogininfor (SysLogininfor logininfor); /** * 查询系统登录日志集合 @@ -37,7 +37,7 @@ public interface SysLogininforService extends IService { * * @return 结果 */ - public int deleteLogininforByIds (Long[] infoIds); + public void deleteLogininforByIds (List infoIds); /** * 清空系统登录日志 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java index 5c523dc..45234ea 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java @@ -131,28 +131,22 @@ public interface SysMenuService extends IService { * 新增保存菜单信息 * * @param menu 菜单信息 - * - * @return 结果 */ - public int insertMenu (SysMenu menu); + public void insertMenu (SysMenu menu); /** * 修改保存菜单信息 * * @param menu 菜单信息 - * - * @return 结果 */ - public int updateMenu (SysMenu menu); + public void updateMenu (SysMenu menu); /** * 删除菜单管理信息 * * @param menuId 菜单ID - * - * @return 结果 */ - public int deleteMenuById (Long menuId); + public void deleteMenuById (Long menuId); /** * 校验菜单名称是否唯一 @@ -163,6 +157,4 @@ public interface SysMenuService extends IService { */ public boolean checkMenuNameUnique (SysMenu menu); - PageQueryModel pageQuery(SysMenuPageQueryModel sysMenuPageQueryModel, Long userId); - } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java index ec3014e..3703d63 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java @@ -13,6 +13,15 @@ import java.util.List; * @author muyu */ public interface SysNoticeService extends IService { + + + /** + * 通知公告份也查询 + * @param sysNoticePageQueryModel 分页查询模型 + * @return 分页结果 + */ + PageQueryModel pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel); + /** * 查询公告信息 * @@ -22,15 +31,6 @@ public interface SysNoticeService extends IService { */ public SysNotice selectNoticeById (Long noticeId); - /** - * 查询公告列表 - * - * @param notice 公告信息 - * - * @return 公告集合 - */ - public List selectNoticeList (SysNotice notice); - /** * 新增公告 * @@ -38,7 +38,7 @@ public interface SysNoticeService extends IService { * * @return 结果 */ - public int insertNotice (SysNotice notice); + public void insertNotice (SysNotice notice); /** * 修改公告 @@ -47,7 +47,7 @@ public interface SysNoticeService extends IService { * * @return 结果 */ - public int updateNotice (SysNotice notice); + public void updateNotice (SysNotice notice); /** * 删除公告信息 @@ -56,7 +56,7 @@ public interface SysNoticeService extends IService { * * @return 结果 */ - public int deleteNoticeById (Long noticeId); + public void deleteNoticeById (Long noticeId); /** * 批量删除公告信息 @@ -65,7 +65,6 @@ public interface SysNoticeService extends IService { * * @return 结果 */ - public int deleteNoticeByIds (Long[] noticeIds); + public void deleteNoticeByIds (List noticeIds); - PageQueryModel pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java index 44fda25..7916497 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java @@ -20,16 +20,14 @@ public interface SysOperLogService extends IService { * * @return 结果 */ - public int insertOperlog (SysOperLog operLog); + public void insertOperlog (SysOperLog operLog); /** - * 查询系统操作日志集合 - * - * @param operLog 操作日志对象 - * - * @return 操作日志集合 + * 操作日志 分页查询 + * @param sysOperlogPageQueryModel 分页模型查询 + * @return 分页结果 */ - public List selectOperLogList (SysOperLog operLog); + PageQueryModel pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel); /** * 批量删除系统操作日志 @@ -38,7 +36,7 @@ public interface SysOperLogService extends IService { * * @return 结果 */ - public int deleteOperLogByIds (Long[] operIds); + public void deleteOperLogByIds (List operIds); /** * 查询操作日志详细 @@ -54,6 +52,4 @@ public interface SysOperLogService extends IService { */ public void cleanOperLog (); - PageQueryModel pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel); - } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java index 3929549..63194df 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java @@ -13,15 +13,6 @@ import java.util.List; * @author muyu */ public interface SysPostService extends IService { - /** - * 查询岗位信息集合 - * - * @param post 岗位信息 - * - * @return 岗位列表 - */ - public List selectPostList (SysPost post); - /** * 查询所有岗位 * @@ -72,7 +63,7 @@ public interface SysPostService extends IService { * * @return 结果 */ - public int countUserPostById (Long postId); + public long countUserPostById (Long postId); /** * 删除岗位信息 @@ -81,7 +72,7 @@ public interface SysPostService extends IService { * * @return 结果 */ - public int deletePostById (Long postId); + public void deletePostById (Long postId); /** * 批量删除岗位信息 @@ -90,7 +81,7 @@ public interface SysPostService extends IService { * * @return 结果 */ - public int deletePostByIds (Long[] postIds); + public void deletePostByIds (List postIds); /** * 新增保存岗位信息 @@ -99,7 +90,7 @@ public interface SysPostService extends IService { * * @return 结果 */ - public int insertPost (SysPost post); + public void insertPost (SysPost post); /** * 修改保存岗位信息 @@ -108,7 +99,7 @@ public interface SysPostService extends IService { * * @return 结果 */ - public int updatePost (SysPost post); + public void updatePost (SysPost post); PageQueryModel pageQuery(SysPostPageQueryModel sysPostPageQueryModel); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleDeptService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleDeptService.java new file mode 100644 index 0000000..ad459ae --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleDeptService.java @@ -0,0 +1,28 @@ +package com.muyu.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.system.domain.SysRoleDept; + +import java.util.List; + +/** + * 角色与部门关联业务层 + * @author dongzeliang + * @version 1.0 + * @description: 角色与部门关联业务 + * @date 2025/2/13 19:42 + */ +public interface SysRoleDeptService extends IService { + + /** + * 通过角色ID删除角色和部门关联 + * @param roleId 角色ID + */ + void deleteRoleDeptByRoleId(Long roleId); + + /** + * 通过角色ID删除角色与部门关联 + * @param roleIds 角色ID集合 + */ + void deleteRoleDept(List roleIds); +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleMenuService.java new file mode 100644 index 0000000..3ac3edc --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleMenuService.java @@ -0,0 +1,35 @@ +package com.muyu.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.system.domain.SysRoleMenu; + +import java.util.List; + +/** + * 角色与菜单关联业务层 + * @author dongzeliang + * @version 1.0 + * @description: 角色与菜单关联 + * @date 2025/2/13 19:10 + */ +public interface SysRoleMenuService extends IService { + + /** + * 查询菜单下是否含有角色 + * @param menuId 菜单ID + * @return 含有角色数量 + */ + boolean checkMenuExistRole(Long menuId); + + /** + * 根据角色ID删除与菜单关联关系 + * @param roleId 角色ID + */ + void deleteRoleMenuByRoleId(Long roleId); + + /** + * 通过角色ID集合删除与菜单关联关系 + * @param roleIdList 角色ID集合 + */ + void deleteRoleMenu(List roleIdList); +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java index 1647adc..667e787 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java @@ -106,7 +106,7 @@ public interface SysRoleService extends IService { * * @return 结果 */ - public int countUserRoleByRoleId (Long roleId); + public long countUserRoleByRoleId (Long roleId); /** * 新增保存角色信息 @@ -132,7 +132,7 @@ public interface SysRoleService extends IService { * @param role 角色信息 * @return 结果 */ - public boolean updateRoleStatus (SysRole role); + public void updateRoleStatus (SysRole role); /** * 修改数据权限信息 @@ -140,7 +140,7 @@ public interface SysRoleService extends IService { * @param role 角色信息 * @return 结果 */ - public boolean authDataScope (SysRole role); + public void authDataScope (SysRole role); /** * 通过角色ID删除角色 @@ -155,10 +155,8 @@ public interface SysRoleService extends IService { * 批量删除角色信息 * * @param roleIds 需要删除的角色ID - * - * @return 结果 */ - public int deleteRoleByIds (Long[] roleIds); + public void deleteRoleByIds (List roleIds); /** * 取消授权用户角色 @@ -167,7 +165,7 @@ public interface SysRoleService extends IService { * * @return 结果 */ - public int deleteAuthUser (SysUserRole userRole); + public void deleteAuthUser (SysUserRole userRole); /** * 批量取消授权用户角色 @@ -177,7 +175,7 @@ public interface SysRoleService extends IService { * * @return 结果 */ - public int deleteAuthUsers (Long roleId, Long[] userIds); + public void deleteAuthUsers (Long roleId, List userIds); /** * 批量选择授权用户角色 @@ -187,7 +185,7 @@ public interface SysRoleService extends IService { * * @return 结果 */ - public int insertAuthUsers (Long roleId, Long[] userIds); + public void insertAuthUsers (Long roleId, List userIds); PageQueryModel pageQuery(SysRolePageQueryModel sysRolePageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserPostService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserPostService.java new file mode 100644 index 0000000..feaf42c --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserPostService.java @@ -0,0 +1,34 @@ +package com.muyu.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.system.domain.SysUserPost; + +import java.util.List; + +/** + * 用户与岗位关联业务层 + * @author dongzeliang + * @version 1.0 + * @description: 用户与岗位关联业务层 + * @date 2025/2/13 21:49 + */ +public interface SysUserPostService extends IService { + /** + * 通过用户ID删除用户与岗位关联 + * @param userId 用户ID + */ + void deleteUserPostByUserId(Long userId); + + /** + * 批量删除用户与岗位关联 + * @param userIds 用户ID集合 + */ + void deleteUserPost(List userIds); + + /** + * 通过岗位ID查询岗位使用数量 + * @param postId 岗位ID + * @return 使用数量 + */ + long countUserPostById(Long postId); +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserRoleService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserRoleService.java new file mode 100644 index 0000000..409f3e2 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserRoleService.java @@ -0,0 +1,59 @@ +package com.muyu.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.system.domain.SysUserRole; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户与角色关联业务层 + * @author dongzeliang + * @version 1.0 + * @description: 用户与角色关联业务层 + * @date 2025/2/13 21:50 + */ +public interface SysUserRoleService extends IService { + + /** + * 通过用户ID删除用户和角色关联 + * + * @param userId 用户ID + * + * @return 结果 + */ + public void deleteUserRoleByUserId (Long userId); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * + * @return 结果 + */ + long countUserRoleByRoleId(Long roleId); + + + /** + * 删除用户和角色关联信息 + * + * @param userRole 用户和角色关联信息 + */ + public void deleteUserRoleInfo (SysUserRole userRole); + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要删除的用户数据ID + * + * @return 结果 + */ + public void deleteUserRoleInfos (Long roleId, List userIds); + + /** + * 删除用户与角色关联 + * @param userIds 用户ID集合 + */ + void deleteUserRole(List userIds); +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java index 90f762d..057964e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java @@ -1,9 +1,7 @@ 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; @@ -20,7 +18,7 @@ public interface SysUserService extends IService { * * @return 用户信息集合信息 */ - public List selectUserList (SysUser user); + List selectUserList (SysUser user); /** * 根据条件分页查询已分配用户角色列表 @@ -29,7 +27,7 @@ public interface SysUserService extends IService { * * @return 用户信息集合信息 */ - public List selectAllocatedList (SysUser user); + List selectAllocatedList (SysUser user); /** * 根据条件分页查询未分配用户角色列表 @@ -38,7 +36,7 @@ public interface SysUserService extends IService { * * @return 用户信息集合信息 */ - public List selectUnallocatedList (SysUser user); + List selectUnallocatedList (SysUser user); /** * 通过用户名查询用户 @@ -47,7 +45,7 @@ public interface SysUserService extends IService { * * @return 用户对象信息 */ - public SysUser selectUserByUserName (String userName); + SysUser selectUserByUserName (String userName); /** * 通过用户ID查询用户 @@ -56,7 +54,7 @@ public interface SysUserService extends IService { * * @return 用户对象信息 */ - public SysUser selectUserById (Long userId); + SysUser selectUserById (Long userId); /** * 根据用户ID查询用户所属角色组 @@ -65,7 +63,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public String selectUserRoleGroup (String userName); + String selectUserRoleGroup (String userName); /** * 根据用户ID查询用户所属岗位组 @@ -74,7 +72,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public String selectUserPostGroup (String userName); + String selectUserPostGroup (String userName); /** * 校验用户名称是否唯一 @@ -83,7 +81,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public boolean checkUserNameUnique (SysUser user); + boolean checkUserNameUnique (SysUser user); /** * 校验手机号码是否唯一 @@ -92,7 +90,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public boolean checkPhoneUnique (SysUser user); + boolean checkPhoneUnique (SysUser user); /** * 校验email是否唯一 @@ -101,21 +99,21 @@ public interface SysUserService extends IService { * * @return 结果 */ - public boolean checkEmailUnique (SysUser user); + boolean checkEmailUnique (SysUser user); /** * 校验用户是否允许操作 * * @param user 用户信息 */ - public void checkUserAllowed (SysUser user); + void checkUserAllowed (SysUser user); /** * 校验用户是否有数据权限 * * @param userId 用户id */ - public void checkUserDataScope (Long userId); + void checkUserDataScope (Long userId); /** * 新增用户信息 @@ -124,7 +122,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public int insertUser (SysUser user); + void insertUser (SysUser user); /** * 注册用户信息 @@ -133,7 +131,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public boolean registerUser (SysUser user); + void registerUser (SysUser user); /** * 修改用户信息 @@ -142,7 +140,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public int updateUser (SysUser user); + void updateUser (SysUser user); /** * 用户授权角色 @@ -150,7 +148,7 @@ public interface SysUserService extends IService { * @param userId 用户ID * @param roleIds 角色组 */ - public void insertUserAuth (Long userId, Long[] roleIds); + void insertUserAuth (Long userId, Long[] roleIds); /** * 修改用户状态 @@ -159,7 +157,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public int updateUserStatus (SysUser user); + void updateUserStatus (SysUser user); /** * 修改用户基本信息 @@ -168,7 +166,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public int updateUserProfile (SysUser user); + void updateUserProfile (SysUser user); /** * 修改用户头像 @@ -178,7 +176,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public boolean updateUserAvatar (String userName, String avatar); + void updateUserAvatar (String userName, String avatar); /** * 重置用户密码 @@ -187,7 +185,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public int resetPwd (SysUser user); + void resetPwd (SysUser user); /** * 重置用户密码 @@ -197,7 +195,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public int resetUserPwd (String userName, String password); + void resetUserPwd (String userName, String password); /** * 通过用户ID删除用户 @@ -206,7 +204,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public int deleteUserById (Long userId); + void deleteUserById (Long userId); /** * 批量删除用户信息 @@ -215,7 +213,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public int deleteUserByIds (Long[] userIds); + void deleteUserByIds (List userIds); /** * 导入用户数据 @@ -226,9 +224,7 @@ public interface SysUserService extends IService { * * @return 结果 */ - public String importUser (List userList, Boolean isUpdateSupport, String operName); - - PageQueryModel pageQuery(SysUserPageQueryModel sysUserPageQueryModel); + String importUser (List userList, Boolean isUpdateSupport, String operName); /** * 检查部门下是否含有用户 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java index 8582443..a614e05 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.Objects; /** + * 系统配置业务实现层 * @author DongZl * @description: 配置plus业务实现层 * @Date 2023-11-13 上午 10:06 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java index ca2c16c..c4114e3 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java @@ -87,7 +87,7 @@ public class SysDictDataServiceImpl extends ServiceImpl dictCodes) { for (Long dictCode : dictCodes) { SysDictData data = this.getOneById(dictCode); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java index 299c3b3..6339865 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java @@ -145,7 +145,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl dictIds) { for (Long dictId : dictIds) { SysDictType dictType = selectDictTypeById(dictId); if (sysDictDataService.isChildByType(dictType.getDictType())) { diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java index a834c38..c5eb3db 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java @@ -34,8 +34,8 @@ public class SysLogininforServiceImpl extends ServiceImpl infoIds) { + this.removeByIds(infoIds); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index 88b738a..9603dc9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -20,6 +20,7 @@ import com.muyu.system.mapper.SysMenuMapper; import com.muyu.system.mapper.SysRoleMapper; import com.muyu.system.mapper.SysRoleMenuMapper; import com.muyu.system.service.SysMenuService; +import com.muyu.system.service.SysRoleMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,7 +43,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl private SysRoleMapper roleMapper; @Autowired - private SysRoleMenuMapper roleMenuMapper; + private SysRoleMenuService sysRoleMenuService; /** * 根据用户查询系统菜单列表 @@ -68,30 +69,20 @@ public class SysMenuServiceImpl extends ServiceImpl impl List menuList = null; // 管理员显示所有菜单信息 if (SysUser.isAdmin(userId)) { - menuList = menuMapper.selectMenuList(menu); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName()); + lambdaQueryWrapper.eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible()); + lambdaQueryWrapper.eq(StringUtils.isNotEmpty(menu.getStatus()), SysMenu::getStatus, menu.getStatus()); + lambdaQueryWrapper.orderByAsc( + SysMenu::getParentId, SysMenu::getOrderNum + ); + menuList = this.list(lambdaQueryWrapper); } else { menu.getParams().put("userId", userId); menuList = menuMapper.selectMenuListByUserId(menu); } return menuList; } - @Override - public PageQueryModel pageQuery(SysMenuPageQueryModel sysMenuPageQueryModel, Long userId) { - Page page = null; - // 管理员显示所有菜单信息 - if (SysUser.isAdmin(userId)) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(StringUtils.isNotEmpty(sysMenuPageQueryModel.getMenuName()),SysMenu::getMenuName, sysMenuPageQueryModel.getMenuName()); - queryWrapper.eq(StringUtils.isNotEmpty(sysMenuPageQueryModel.getStatus()),SysMenu::getStatus, sysMenuPageQueryModel.getStatus()); - page = this.page(sysMenuPageQueryModel.buildPage(), queryWrapper); - } else { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(StringUtils.isNotEmpty(sysMenuPageQueryModel.getMenuName()),SysMenu::getMenuName, sysMenuPageQueryModel.getMenuName()); - queryWrapper.eq(StringUtils.isNotEmpty(sysMenuPageQueryModel.getStatus()),SysMenu::getStatus, sysMenuPageQueryModel.getStatus()); - page = this.page(sysMenuPageQueryModel.buildPage(), queryWrapper); - } - return PageQueryModel.of(page); - } /** * 根据用户ID查询权限 @@ -275,7 +266,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl */ @Override public SysMenu selectMenuById (Long menuId) { - return menuMapper.selectMenuById(menuId); + return this.getById(menuId); } /** @@ -287,8 +278,12 @@ public class SysMenuServiceImpl extends ServiceImpl impl */ @Override public boolean hasChildByMenuId (Long menuId) { - int result = menuMapper.hasChildByMenuId(menuId); - return result > 0; + // select count(1) + // from sys_menu + // where parent_id = #{menuId} + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysMenu::getParentId, menuId); + return this.count(lambdaQueryWrapper) > 0; } /** @@ -300,8 +295,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl */ @Override public boolean checkMenuExistRole (Long menuId) { - int result = roleMenuMapper.checkMenuExistRole(menuId); - return result > 0; + return sysRoleMenuService.checkMenuExistRole(menuId); } /** @@ -312,8 +306,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int insertMenu (SysMenu menu) { - return menuMapper.insertMenu(menu); + public void insertMenu (SysMenu menu) { + this.save(menu); } /** @@ -324,8 +318,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int updateMenu (SysMenu menu) { - return menuMapper.updateMenu(menu); + public void updateMenu (SysMenu menu) { + this.updateById(menu); } /** @@ -336,8 +330,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int deleteMenuById (Long menuId) { - return menuMapper.deleteMenuById(menuId); + public void deleteMenuById (Long menuId) { + this.removeById(menuId); } /** @@ -349,9 +343,10 @@ public class SysMenuServiceImpl extends ServiceImpl impl */ @Override public boolean checkMenuNameUnique (SysMenu menu) { - Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId(); - SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId()); - if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysMenu::getMenuName, menu.getMenuName()); + lambdaQueryWrapper.ne(menu.getMenuId() != null, SysMenu::getParentId, menu.getParentId()); + if (this.count(lambdaQueryWrapper) > 0) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java index 2facb8a..cb2c0e5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java @@ -27,6 +27,21 @@ public class SysNoticeServiceImpl extends ServiceImpl pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysNoticePageQueryModel.getNoticeTitle()),SysNotice::getNoticeTitle, sysNoticePageQueryModel.getNoticeTitle()); + queryWrapper.eq(StringUtils.isNotEmpty(sysNoticePageQueryModel.getNoticeType()),SysNotice::getNoticeType, sysNoticePageQueryModel.getNoticeType()); + queryWrapper.like(StringUtils.isNotEmpty(sysNoticePageQueryModel.getCreateBy()),SysNotice::getCreateBy, sysNoticePageQueryModel.getCreateBy()); + Page page = this.page(sysNoticePageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } + /** * 查询公告信息 * @@ -36,19 +51,7 @@ public class SysNoticeServiceImpl extends ServiceImpl selectNoticeList (SysNotice notice) { - return noticeMapper.selectNoticeList(notice); + return this.getById(noticeId); } /** @@ -59,8 +62,8 @@ public class SysNoticeServiceImpl extends ServiceImpl noticeIds) { + this.removeByIds(noticeIds); } - @Override - public PageQueryModel pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(StringUtils.isNotEmpty(sysNoticePageQueryModel.getNoticeTitle()),SysNotice::getNoticeTitle, sysNoticePageQueryModel.getNoticeTitle()); - queryWrapper.eq(StringUtils.isNotEmpty(sysNoticePageQueryModel.getNoticeType()),SysNotice::getNoticeType, sysNoticePageQueryModel.getNoticeType()); - queryWrapper.like(StringUtils.isNotEmpty(sysNoticePageQueryModel.getCreateBy()),SysNotice::getCreateBy, sysNoticePageQueryModel.getCreateBy()); - Page page = this.page(sysNoticePageQueryModel.buildPage(), queryWrapper); - return PageQueryModel.of(page); - } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java index d924b22..1bc4aab 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java @@ -34,54 +34,16 @@ public class SysOperLogServiceImpl extends ServiceImpl selectOperLogList (SysOperLog operLog) { - return operLogMapper.selectOperLogList(operLog); - } - - /** - * 批量删除系统操作日志 - * - * @param operIds 需要删除的操作日志ID - * - * @return 结果 - */ - @Override - public int deleteOperLogByIds (Long[] operIds) { - return operLogMapper.deleteOperLogByIds(operIds); - } - - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * - * @return 操作日志对象 - */ - @Override - public SysOperLog selectOperLogById (Long operId) { - return operLogMapper.selectOperLogById(operId); - } - - /** - * 清空操作日志 - */ - @Override - public void cleanOperLog () { - operLogMapper.cleanOperLog(); - } - @Override public PageQueryModel pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -95,4 +57,37 @@ public class SysOperLogServiceImpl extends ServiceImpl page = this.page(sysOperlogPageQueryModel.buildPage(), queryWrapper); return PageQueryModel.of(page); } + + /** + * 批量删除系统操作日志 + * + * @param operIds 需要删除的操作日志ID + * + * @return 结果 + */ + @Override + public void deleteOperLogByIds (List operIds) { + this.removeByIds(operIds); + } + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * + * @return 操作日志对象 + */ + @Override + public SysOperLog selectOperLogById (Long operId) { + return getById(operId); + } + + /** + * 清空操作日志 + */ + @Override + public void cleanOperLog () { + operLogMapper.cleanOperLog(); + } + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java index 341d45a..784d36c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java @@ -13,6 +13,7 @@ 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; +import com.muyu.system.service.SysUserPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,17 +33,8 @@ public class SysPostServiceImpl extends ServiceImpl impl @Autowired private SysUserPostMapper userPostMapper; - /** - * 查询岗位信息集合 - * - * @param post 岗位信息 - * - * @return 岗位信息集合 - */ - @Override - public List selectPostList (SysPost post) { - return postMapper.selectPostList(post); - } + @Autowired + private SysUserPostService sysUserPostService; /** * 查询所有岗位 @@ -51,7 +43,7 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public List selectPostAll () { - return postMapper.selectPostAll(); + return this.list(); } /** @@ -63,7 +55,7 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public SysPost selectPostById (Long postId) { - return postMapper.selectPostById(postId); + return getById(postId); } /** @@ -87,9 +79,10 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public boolean checkPostNameUnique (SysPost post) { - Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); - SysPost info = postMapper.checkPostNameUnique(post.getPostName()); - if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysPost::getPostName, post.getPostName()); + lambdaQueryWrapper.eq(post.getPostId() != null, SysPost::getPostId, post.getPostId()); + if (this.count(lambdaQueryWrapper) != 0) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -104,9 +97,11 @@ public class SysPostServiceImpl extends ServiceImpl impl */ @Override public boolean checkPostCodeUnique (SysPost post) { - Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); - SysPost info = postMapper.checkPostCodeUnique(post.getPostCode()); - if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) { + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysPost::getPostCode, post.getPostCode()); + lambdaQueryWrapper.eq(post.getPostId() != null, SysPost::getPostId, post.getPostId()); + if (this.count(lambdaQueryWrapper) != 0) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -120,8 +115,8 @@ public class SysPostServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int countUserPostById (Long postId) { - return userPostMapper.countUserPostById(postId); + public long countUserPostById (Long postId) { + return sysUserPostService.countUserPostById(postId); } /** @@ -132,8 +127,8 @@ public class SysPostServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int deletePostById (Long postId) { - return postMapper.deletePostById(postId); + public void deletePostById (Long postId) { + this.removeById(postId); } /** @@ -144,14 +139,14 @@ public class SysPostServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int deletePostByIds (Long[] postIds) { + public void deletePostByIds (List postIds) { for (Long postId : postIds) { SysPost post = selectPostById(postId); if (countUserPostById(postId) > 0) { throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName())); } } - return postMapper.deletePostByIds(postIds); + this.removeByIds(postIds); } /** @@ -162,8 +157,8 @@ public class SysPostServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int insertPost (SysPost post) { - return postMapper.insertPost(post); + public void insertPost (SysPost post) { + this.save(post); } /** @@ -174,8 +169,8 @@ public class SysPostServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int updatePost (SysPost post) { - return postMapper.updatePost(post); + public void updatePost (SysPost post) { + this.updateById(post); } @Override diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleDeptServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleDeptServiceImpl.java new file mode 100644 index 0000000..de8b378 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleDeptServiceImpl.java @@ -0,0 +1,44 @@ +package com.muyu.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.system.domain.SysRoleDept; +import com.muyu.system.mapper.SysRoleDeptMapper; +import com.muyu.system.service.SysRoleDeptService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * + * 角色与部门关联业务实现 + * @author dongzeliang + * @version 1.0 + * @description: 角色与部门关联业务实现 + * @date 2025/2/13 19:43 + */ +@Service +public class SysRoleDeptServiceImpl extends ServiceImpl implements SysRoleDeptService { + /** + * 通过角色ID删除角色和部门关联 + * + * @param roleId 角色ID + */ + @Override + public void deleteRoleDeptByRoleId(Long roleId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper().eq(SysRoleDept::getRoleId, roleId); + this.remove(lambdaQueryWrapper); + } + + /** + * 通过角色ID删除角色与部门关联 + * + * @param roleIds 角色ID集合 + */ + @Override + public void deleteRoleDept(List roleIds) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(SysRoleDept::getRoleId, roleIds); + this.remove(lambdaQueryWrapper); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleMenuServiceImpl.java new file mode 100644 index 0000000..244539e --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleMenuServiceImpl.java @@ -0,0 +1,58 @@ +package com.muyu.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.system.domain.SysRoleMenu; +import com.muyu.system.mapper.SysRoleMenuMapper; +import com.muyu.system.service.SysRoleMenuService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 角色与菜单关联业务实现层 + * @author dongzeliang + * @version 1.0 + * @description: 角色与菜单关联业务实现层 + * @date 2025/2/13 19:11 + */ +@Service +public class SysRoleMenuServiceImpl extends ServiceImpl implements SysRoleMenuService { + /** + * 查询菜单下是否含有角色 + * + * @param menuId 菜单ID + * @return 含有角色数量 + */ + @Override + public boolean checkMenuExistRole(Long menuId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysRoleMenu::getMenuId, menuId); + return count(lambdaQueryWrapper) > 0; + } + + /** + * 根据角色ID删除与菜单关联关系 + * + * @param roleId 角色ID + */ + @Override + public void deleteRoleMenuByRoleId(Long roleId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysRoleMenu::getRoleId, roleId); + this.remove(lambdaQueryWrapper); + } + + /** + * 通过角色ID集合删除与菜单关联关系 + * + * @param roleIdList 角色ID集合 + */ + @Override + public void deleteRoleMenu(List roleIdList) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(SysRoleMenu::getRoleId, roleIdList); + this.remove(lambdaQueryWrapper); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java index 9f921a1..0bb009a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java @@ -5,13 +5,13 @@ 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.enums.SysDelFlagEnum; 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; @@ -20,9 +20,11 @@ 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; import com.muyu.system.mapper.SysUserRoleMapper; +import com.muyu.system.service.SysRoleDeptService; +import com.muyu.system.service.SysRoleMenuService; import com.muyu.system.service.SysRoleService; +import com.muyu.system.service.SysUserRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,13 +42,13 @@ public class SysRoleServiceImpl extends ServiceImpl impl private SysRoleMapper roleMapper; @Autowired - private SysRoleMenuMapper roleMenuMapper; + private SysUserRoleService sysUserRoleService; @Autowired - private SysUserRoleMapper userRoleMapper; + private SysRoleMenuService sysRoleMenuService; @Autowired - private SysRoleDeptMapper roleDeptMapper; + private SysRoleDeptService sysRoleDeptService; /** * 根据条件分页查询角色数据 @@ -216,8 +218,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int countUserRoleByRoleId (Long roleId) { - return userRoleMapper.countUserRoleByRoleId(roleId); + public long countUserRoleByRoleId (Long roleId) { + return sysUserRoleService.countUserRoleByRoleId(roleId); } /** @@ -277,7 +279,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl // 执行更新 this.update(updateWrapper); // 删除角色与菜单关联 - roleMenuMapper.deleteRoleMenuByRoleId(sysRole.getRoleId()); + sysRoleMenuService.deleteRoleMenuByRoleId(sysRole.getRoleId()); return insertRoleMenu(sysRole); } @@ -288,9 +290,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public boolean updateRoleStatus (SysRole role) { + public void updateRoleStatus (SysRole role) { // 通过 roleId 更新角色信息 - return updateById(role); + updateById(role); } /** @@ -301,14 +303,13 @@ public class SysRoleServiceImpl extends ServiceImpl impl */ @Override @Transactional(rollbackFor = Exception.class) - public boolean authDataScope (SysRole role) { + public void authDataScope (SysRole role) { // 修改角色信息 // 通过 roleId 更新角色信息 - boolean updateResult = updateById(role); + updateById(role); // 删除角色与部门关联 - roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId()); - // 新增角色和部门信息（数据权限） - return updateResult; + sysRoleDeptService.deleteRoleDeptByRoleId(role.getRoleId()); + // TODO 可能代码缺失 新增角色和部门信息（数据权限） } /** @@ -319,7 +320,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl public int insertRoleMenu (SysRole role) { // 假设role.getMenuIds()返回角色关联的菜单ID列表 List menuIds = List.of(role.getMenuIds()); - if (menuIds == null || menuIds.isEmpty()){ + if (menuIds.isEmpty()){ return 0; } // 新增用户与角色管理 @@ -331,7 +332,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl list.add(rm); } // 使用MyBatis-Plus的saveBatch方法批量插入角色与菜单的关联关系 - boolean saveResult = roleMenuMapper.saveBatch(list); + boolean saveResult = sysRoleMenuService.saveBatch(list); // 返回成功插入的数量 return saveResult ? list.size() : 0; @@ -352,8 +353,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl rd.setDeptId(deptId); list.add(rd); } - if (list.size() > 0) { - rows = roleDeptMapper.batchRoleDept(list); + if (!list.isEmpty()) { + sysRoleDeptService.saveBatch(list); } return rows; } @@ -369,9 +370,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public int deleteRoleById (Long roleId) { // 删除角色与菜单关联 - roleMenuMapper.deleteRoleMenuByRoleId(roleId); + sysRoleMenuService.deleteRoleMenuByRoleId(roleId); // 删除角色与部门关联 - roleDeptMapper.deleteRoleDeptByRoleId(roleId); + sysRoleDeptService.deleteRoleDeptByRoleId(roleId); return roleMapper.deleteRoleById(roleId); } @@ -384,7 +385,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl */ @Override @Transactional(rollbackFor = Exception.class) - public int deleteRoleByIds (Long[] roleIds) { + public void deleteRoleByIds (List roleIds) { for (Long roleId : roleIds) { checkRoleAllowed(new SysRole(roleId)); checkRoleDataScope(roleId); @@ -394,10 +395,13 @@ public class SysRoleServiceImpl extends ServiceImpl impl } } // 删除角色与菜单关联 - roleMenuMapper.deleteRoleMenu(roleIds); + sysRoleMenuService.deleteRoleMenu(roleIds); // 删除角色与部门关联 - roleDeptMapper.deleteRoleDept(roleIds); - return roleMapper.deleteRoleByIds(roleIds); + sysRoleDeptService.deleteRoleDept(roleIds); + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(SysRole::getDelFlag, SysDelFlagEnum.NOT_EXIST.getCode()); + lambdaUpdateWrapper.eq(SysRole::getRoleId, roleIds); + this.removeByIds(roleIds); } /** @@ -408,8 +412,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int deleteAuthUser (SysUserRole userRole) { - return userRoleMapper.deleteUserRoleInfo(userRole); + public void deleteAuthUser (SysUserRole userRole) { + sysUserRoleService.deleteUserRoleInfo(userRole); } /** @@ -421,8 +425,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int deleteAuthUsers (Long roleId, Long[] userIds) { - return userRoleMapper.deleteUserRoleInfos(roleId, userIds); + public void deleteAuthUsers (Long roleId, List userIds) { + sysUserRoleService.deleteUserRoleInfos(roleId, userIds); } /** @@ -434,16 +438,16 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int insertAuthUsers (Long roleId, Long[] userIds) { + public void insertAuthUsers (Long roleId, List userIds) { // 新增用户与角色管理 - List list = new ArrayList(); + List list = new ArrayList<>(); for (Long userId : userIds) { SysUserRole ur = new SysUserRole(); ur.setUserId(userId); ur.setRoleId(roleId); list.add(ur); } - return userRoleMapper.batchUserRole(list); + sysUserRoleService.saveBatch(list); } @Override diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserPostServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserPostServiceImpl.java new file mode 100644 index 0000000..f832604 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserPostServiceImpl.java @@ -0,0 +1,58 @@ +package com.muyu.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.system.domain.SysUserPost; +import com.muyu.system.mapper.SysUserPostMapper; +import com.muyu.system.service.SysUserPostService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 用户与岗位关联业务实现层 + * @author dongzeliang + * @version 1.0 + * @description: 用户与岗位关联业务实现层 + * @date 2025/2/13 21:51 + */ +@Service +public class SysUserPostServiceImpl extends ServiceImpl implements SysUserPostService { + /** + * 通过用户ID删除用户与岗位关联 + * + * @param userId 用户ID + */ + @Override + public void deleteUserPostByUserId(Long userId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysUserPost::getUserId, userId); + this.remove(lambdaQueryWrapper); + } + + /** + * 批量删除用户与岗位关联 + * + * @param userIds 用户ID集合 + */ + @Override + public void deleteUserPost(List userIds) { + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(SysUserPost::getUserId, userIds); + this.remove(lambdaQueryWrapper); + } + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 使用数量 + */ + @Override + public long countUserPostById(Long postId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysUserPost::getPostId, postId); + return this.count(lambdaQueryWrapper); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserRoleServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserRoleServiceImpl.java new file mode 100644 index 0000000..00a0b41 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserRoleServiceImpl.java @@ -0,0 +1,92 @@ +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.service.impl.ServiceImpl; +import com.muyu.system.domain.SysUserRole; +import com.muyu.system.mapper.SysUserRoleMapper; +import com.muyu.system.service.SysUserRoleService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 用户与角色关联业务实现层 + * @author dongzeliang + * @version 1.0 + * @description: 用户与角色关联业务实现层 + * @date 2025/2/13 21:50 + */ +@Service +public class SysUserRoleServiceImpl extends ServiceImpl implements SysUserRoleService { + /** + * 通过用户ID删除用户和角色关联 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + public void deleteUserRoleByUserId(Long userId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysUserRole::getUserId, userId); + this.remove(lambdaQueryWrapper); + } + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + public long countUserRoleByRoleId(Long roleId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysUserRole::getRoleId, roleId); + return this.count(lambdaQueryWrapper); + } + + /** + * 删除用户和角色关联信息 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + @Override + public void deleteUserRoleInfo(SysUserRole userRole) { + //delete + // from sys_user_role + // where user_id = #{userId} + // and role_id = #{roleId} + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper(); + lambdaUpdateWrapper.eq(SysUserRole::getUserId, userRole.getUserId()); + lambdaUpdateWrapper.eq(SysUserRole::getRoleId, userRole.getRoleId()); + this.remove(lambdaUpdateWrapper); + } + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要删除的用户数据ID + * @return 结果 + */ + @Override + public void deleteUserRoleInfos(Long roleId, List userIds) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysUserRole::getRoleId, roleId); + lambdaQueryWrapper.in(SysUserRole::getUserId, userIds); + this.remove(lambdaQueryWrapper); + } + + /** + * 删除用户与角色关联 + * + * @param userIds 用户ID集合 + */ + @Override + public void deleteUserRole(List userIds) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + lambdaQueryWrapper.in(SysUserRole::getUserId, userIds); + this.remove(lambdaQueryWrapper); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index b9dd9a4..09929ac 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -1,15 +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.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; +import com.muyu.common.core.enums.SysDelFlagEnum; import com.muyu.common.core.enums.SysNormalDisableEnum; 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; @@ -17,8 +18,9 @@ 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.SysUserPostService; +import com.muyu.system.service.SysUserRoleService; import com.muyu.system.service.SysUserService; import com.muyu.system.service.SysConfigService; import jakarta.validation.Validator; @@ -31,7 +33,6 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; /** @@ -52,8 +53,11 @@ public class SysUserServiceImpl extends ServiceImpl impl private SysPostMapper postMapper; @Autowired private SysUserRoleMapper userRoleMapper; + @Autowired - private SysUserPostMapper userPostMapper; + private SysUserRoleService sysUserRoleService; + @Autowired + private SysUserPostService sysUserPostService; @Autowired private SysConfigService configService; @@ -161,12 +165,14 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override public boolean checkUserNameUnique (SysUser user) { - Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); - SysUser info = userMapper.checkUserNameUnique(user.getUserName()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { - return UserConstants.NOT_UNIQUE; + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysUser::getUserName, user.getUserName()); + lambdaQueryWrapper.eq(SysUser::getDelFlag, SysDelFlagEnum.EXIST.getCode()); + lambdaQueryWrapper.eq(user.getUserId() != null,SysUser::getUserId, user.getUserId()); + if (this.count(lambdaQueryWrapper) > 0) { + return UserConstants.UNIQUE; } - return UserConstants.UNIQUE; + return UserConstants.NOT_UNIQUE; } /** @@ -178,12 +184,14 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override public boolean checkPhoneUnique (SysUser user) { - Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); - SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { - return UserConstants.NOT_UNIQUE; + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysUser::getPhonenumber, user.getPhonenumber()); + lambdaQueryWrapper.eq(SysUser::getDelFlag, SysDelFlagEnum.EXIST.getCode()); + lambdaQueryWrapper.eq(user.getUserId() != null,SysUser::getUserId, user.getUserId()); + if (this.count(lambdaQueryWrapper) > 0) { + return UserConstants.UNIQUE; } - return UserConstants.UNIQUE; + return UserConstants.NOT_UNIQUE; } /** @@ -195,12 +203,14 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override public boolean checkEmailUnique (SysUser user) { - Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); - SysUser info = userMapper.checkEmailUnique(user.getEmail()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { - return UserConstants.NOT_UNIQUE; + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(SysUser::getEmail, user.getEmail()); + lambdaQueryWrapper.eq(SysUser::getDelFlag, SysDelFlagEnum.EXIST.getCode()); + lambdaQueryWrapper.eq(user.getUserId() != null,SysUser::getUserId, user.getUserId()); + if (this.count(lambdaQueryWrapper) > 0) { + return UserConstants.UNIQUE; } - return UserConstants.UNIQUE; + return UserConstants.NOT_UNIQUE; } /** @@ -241,14 +251,13 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override @Transactional(rollbackFor = Exception.class) - public int insertUser (SysUser user) { + public void insertUser (SysUser user) { // 新增用户信息 - int rows = userMapper.insertUser(user); + this.save(user); // 新增用户岗位关联 insertUserPost(user); // 新增用户与角色管理 insertUserRole(user); - return rows; } /** @@ -259,8 +268,8 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public boolean registerUser (SysUser user) { - return userMapper.insertUser(user) > 0; + public void registerUser (SysUser user) { + this.save(user); } /** @@ -272,17 +281,17 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override @Transactional(rollbackFor = Exception.class) - public int updateUser (SysUser user) { + public void updateUser (SysUser user) { Long userId = user.getUserId(); // 删除用户与角色关联 - userRoleMapper.deleteUserRoleByUserId(userId); + sysUserRoleService.deleteUserRoleByUserId(userId); // 新增用户与角色管理 insertUserRole(user); // 删除用户与岗位关联 - userPostMapper.deleteUserPostByUserId(userId); + sysUserPostService.deleteUserPostByUserId(userId); // 新增用户与岗位管理 insertUserPost(user); - return userMapper.updateUser(user); + this.updateById(user); } /** @@ -294,7 +303,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public void insertUserAuth (Long userId, Long[] roleIds) { - userRoleMapper.deleteUserRoleByUserId(userId); + sysUserRoleService.deleteUserRoleByUserId(userId); insertUserRole(userId, roleIds); } @@ -306,8 +315,13 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int updateUserStatus (SysUser user) { - return userMapper.updateUser(user); + public void updateUserStatus (SysUser user) { + // set status = #{status} + // where user_id = #{userId} + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.eq(SysUser::getUserId, user.getUserId()); + lambdaUpdateWrapper.set(SysUser::getStatus, user.getStatus()); + this.update(lambdaUpdateWrapper); } /** @@ -318,8 +332,8 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int updateUserProfile (SysUser user) { - return userMapper.updateUser(user); + public void updateUserProfile (SysUser user) { + this.updateById(user); } /** @@ -331,8 +345,11 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public boolean updateUserAvatar (String userName, String avatar) { - return userMapper.updateUserAvatar(userName, avatar) > 0; + public void updateUserAvatar (String userName, String avatar) { + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.eq(SysUser::getUserName, userName); + lambdaUpdateWrapper.eq(SysUser::getAvatar, avatar); + this.update(lambdaUpdateWrapper); } /** @@ -343,8 +360,12 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int resetPwd (SysUser user) { - return userMapper.updateUser(user); + public void resetPwd (SysUser user) { + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(SysUser::getPassword, user.getPassword()); + lambdaUpdateWrapper.set(SysUser::getUpdateBy, SecurityUtils.getUsername()); + lambdaUpdateWrapper.eq(SysUser::getUserName, user.getUserName()); + this.update(lambdaUpdateWrapper); } /** @@ -356,8 +377,11 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return 结果 */ @Override - public int resetUserPwd (String userName, String password) { - return userMapper.resetUserPwd(userName, password); + public void resetUserPwd (String userName, String password) { + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(SysUser::getPassword, password); + lambdaUpdateWrapper.eq(SysUser::getUserName, userName); + this.update(lambdaUpdateWrapper); } /** @@ -385,7 +409,7 @@ public class SysUserServiceImpl extends ServiceImpl impl up.setPostId(postId); list.add(up); } - userPostMapper.batchUserPost(list); + sysUserPostService.saveBatch(list); } } @@ -405,7 +429,7 @@ public class SysUserServiceImpl extends ServiceImpl impl ur.setRoleId(roleId); list.add(ur); } - userRoleMapper.batchUserRole(list); + sysUserRoleService.saveBatch(list); } } @@ -418,12 +442,15 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override @Transactional(rollbackFor = Exception.class) - public int deleteUserById (Long userId) { + public void deleteUserById (Long userId) { // 删除用户与角色关联 - userRoleMapper.deleteUserRoleByUserId(userId); + sysUserRoleService.deleteUserRoleByUserId(userId); // 删除用户与岗位表 - userPostMapper.deleteUserPostByUserId(userId); - return userMapper.deleteUserById(userId); + sysUserPostService.deleteUserPostByUserId(userId); + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(SysUser::getDelFlag, SysDelFlagEnum.NOT_EXIST.getCode()); + lambdaUpdateWrapper.eq(SysUser::getUserId, userId); + this.update(lambdaUpdateWrapper); } /** @@ -435,16 +462,19 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override @Transactional(rollbackFor = Exception.class) - public int deleteUserByIds (Long[] userIds) { + public void deleteUserByIds (List userIds) { for (Long userId : userIds) { checkUserAllowed(new SysUser(userId)); checkUserDataScope(userId); } // 删除用户与角色关联 - userRoleMapper.deleteUserRole(userIds); + sysUserRoleService.deleteUserRole(userIds); // 删除用户与岗位关联 - userPostMapper.deleteUserPost(userIds); - return userMapper.deleteUserByIds(userIds); + sysUserPostService.deleteUserPost(userIds); + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(SysUser::getDelFlag, SysDelFlagEnum.NOT_EXIST.getCode()); + lambdaUpdateWrapper.in(SysUser::getUserId, userIds); + this.update(lambdaUpdateWrapper); } /** @@ -474,7 +504,7 @@ public class SysUserServiceImpl extends ServiceImpl impl BeanValidators.validateWithException(validator, user); user.setPassword(SecurityUtils.encryptPassword(password)); user.setCreateBy(operName); - userMapper.insertUser(user); + this.save(user); successNum++; successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 导入成功"); } else if (isUpdateSupport) { @@ -483,7 +513,7 @@ public class SysUserServiceImpl extends ServiceImpl impl checkUserDataScope(u.getUserId()); user.setUserId(u.getUserId()); user.setUpdateBy(operName); - userMapper.updateUser(user); + this.updateById(user); successNum++; successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 更新成功"); } else { @@ -505,19 +535,6 @@ public class SysUserServiceImpl extends ServiceImpl impl } return successMsg.toString(); } - - @Override - public PageQueryModel pageQuery(SysUserPageQueryModel sysUserPageQueryModel) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(StringUtils.isNotEmpty(sysUserPageQueryModel.getPhonenumber()),SysUser::getPhonenumber, sysUserPageQueryModel.getPhonenumber()); - queryWrapper.eq(StringUtils.isNotEmpty(sysUserPageQueryModel.getNickName()),SysUser::getNickName, sysUserPageQueryModel.getNickName()); - queryWrapper.eq(Objects.nonNull(sysUserPageQueryModel.getStatus()),SysUser::getStatus, sysUserPageQueryModel.getStatus()); - queryWrapper.gt(Objects.nonNull(sysUserPageQueryModel.getBeginTime()),SysUser::getCreateTime, sysUserPageQueryModel.getBeginTime()); - queryWrapper.lt(Objects.nonNull(sysUserPageQueryModel.getEndTime()),SysUser::getCreateTime, sysUserPageQueryModel.getEndTime()); - Page page = this.page(sysUserPageQueryModel.buildPage(), queryWrapper); - return PageQueryModel.of(page); - } - /** * 检查部门下是否含有用户 * diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 114599c..a1540b9 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -13,39 +13,6 @@ - - insert into sys_logininfor (user_name, status, ipaddr, msg, access_time) - values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate()) - - - - - - delete from sys_logininfor where info_id in - - #{infoId} - - truncate table sys_logininfor diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml index 1dac5c4..027008d 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -46,22 +46,6 @@ from sys_menu - - - - - - - - - - - - - update sys_menu - - menu_name = #{menuName}, - parent_id = #{parentId}, - order_num = #{orderNum}, - path = #{path}, - component = #{component}, - `query` = #{query}, - is_frame = #{isFrame}, - is_cache = #{isCache}, - menu_type = #{menuType}, - visible = #{visible}, - status = #{status}, - perms = #{perms}, - icon = #{icon}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where menu_id = #{menuId} - - - - insert into sys_menu( - menu_id, - parent_id, - menu_name, - order_num, - path, - component, - `query`, - is_frame, - is_cache, - menu_type, - visible, - status, - perms, - icon, - remark, - create_by, - create_time - )values( - #{menuId}, - #{parentId}, - #{menuName}, - #{orderNum}, - #{path}, - #{component}, - #{query}, - #{isFrame}, - #{isCache}, - #{menuType}, - #{visible}, - #{status}, - #{perms}, - #{icon}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - delete - from sys_menu - where menu_id = #{menuId} - - diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 0687403..6cacfbb 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -31,70 +31,4 @@ from sys_notice - - - - - - insert into sys_notice ( - notice_title, - notice_type, - notice_content, - status, - remark, - create_by, - create_time - )values( - #{noticeTitle}, - #{noticeType}, - #{noticeContent}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - update sys_notice - - notice_title = #{noticeTitle}, - notice_type = #{noticeType}, - notice_content = #{noticeContent}, - status = #{status}, - update_by = #{updateBy}, - update_time = sysdate() - - where notice_id = #{noticeId} - - - - delete - from sys_notice - where notice_id = #{noticeId} - - - - delete from sys_notice where notice_id in - - #{noticeId} - - - diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 1834ea1..79c0f83 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -50,52 +50,6 @@ #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) - - - - delete from sys_oper_log where oper_id in - - #{operId} - - - - - truncate table sys_oper_log diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 1a9ab92..7931677 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -9,30 +9,4 @@ - - delete - from sys_role_dept - where role_id = #{roleId} - - - - - - delete from sys_role_dept where role_id in - - #{roleId} - - - - - insert into sys_role_dept(role_id, dept_id) values - - (#{item.roleId},#{item.deptId}) - - - diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index 5540dde..66a15ef 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -9,36 +9,5 @@ - - - - delete - from sys_role_menu - where role_id = #{roleId} - - - - delete from sys_role_menu where role_id in - - #{roleId} - - - - - insert into sys_role_menu(role_id, menu_id) values - - (#{item.roleId},#{item.menuId}) - - - - insert into sys_role_menu(role_id, menu_id) values - - (#{item.roleId},#{item.menuId}) - - diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml index 6f633b7..0b5e5a5 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -160,112 +160,11 @@ where u.user_id = #{userId} - - - - - - - - insert into sys_user( - user_id, - dept_id, - user_name, - nick_name, - email, - avatar, - phonenumber, - sex, - password, - status, - create_by, - remark, - create_time - )values( - #{userId}, - #{deptId}, - #{userName}, - #{nickName}, - #{email}, - #{avatar}, - #{phonenumber}, - #{sex}, - #{password}, - #{status}, - #{createBy}, - #{remark}, - sysdate() - ) - - - - update sys_user - - dept_id = #{deptId}, - user_name = #{userName}, - nick_name = #{nickName}, - email = #{email}, - phonenumber = #{phonenumber}, - sex = #{sex}, - avatar = #{avatar}, - password = #{password}, - status = #{status}, - login_ip = #{loginIp}, - login_date = #{loginDate}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = sysdate() - - where user_id = #{userId} - - update sys_user set status = #{status} where user_id = #{userId} - - update sys_user - set avatar = #{avatar} - where user_name = #{userName} - - - - update sys_user - set password = #{password} - where user_name = #{userName} - - - - update sys_user - set del_flag = '2' - where user_id = #{userId} - - - - update sys_user set del_flag = '2' where user_id in - - #{userId} - - diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 30e4f06..37ad1e8 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -9,30 +9,5 @@ - - delete - from sys_user_post - where user_id = #{userId} - - - - - - delete from sys_user_post where user_id in - - #{userId} - - - - - insert into sys_user_post(user_id, post_id) values - - (#{item.userId},#{item.postId}) - - diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index b93bc72..fcbfb9b 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -8,44 +8,4 @@ - - - delete - from sys_user_role - where user_id = #{userId} - - - - - - delete from sys_user_role where user_id in - - #{userId} - - - - - insert into sys_user_role(user_id, role_id) values - - (#{item.userId},#{item.roleId}) - - - - - delete - from sys_user_role - where user_id = #{userId} - and role_id = #{roleId} - - - - delete from sys_user_role where role_id=#{roleId} and user_id in - - #{userId} - -