From 866c5588d497cbf28a940775a47869bd2508a69f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 28 四月 2024 14:15:19 +0800
Subject: [PATCH] 用户功能完成
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/entity/SysUserRole.java | 5
/dev/null | 20 --
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/base/BaseController.java | 53 +++++
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 40 ++-
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java | 103 +++++++++
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java | 124 +++++++++++-
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/SysMenuService.java | 13 +
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java | 96 +++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 11 +
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java | 113 +++++++++++
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/SysUserService.java | 16 +
11 files changed, 534 insertions(+), 60 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
new file mode 100644
index 0000000..8e08002
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -0,0 +1,11 @@
+package com.mes.common.config;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/4/24 10:33
+ * @Description:
+ */
+public class Const {
+ public static final String DEFULT_PASSWORD = "123456";
+ public static final Long DEFULT_ROLE = 1L;
+}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/base/BaseController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/base/BaseController.java
new file mode 100644
index 0000000..ac66731
--- /dev/null
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/base/BaseController.java
@@ -0,0 +1,53 @@
+package com.mes.base;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.common.utils.RedisUtil;
+import com.mes.menu.service.SysMenuService;
+import com.mes.role.service.SysRoleMenuService;
+import com.mes.role.service.SysRoleService;
+import com.mes.userinfo.service.SysUserRoleService;
+import com.mes.userinfo.service.SysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.ServletRequestUtils;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/4/24 10:00
+ * @Description:
+ */
+public class BaseController {
+ @Autowired
+ public HttpServletRequest req;
+
+ @Autowired
+ public RedisUtil redisUtil;
+
+ @Autowired
+ public SysUserService sysUserService;
+
+ @Autowired
+ public SysRoleService sysRoleService;
+
+ @Autowired
+ public SysMenuService sysMenuService;
+
+ @Autowired
+ public SysUserRoleService sysUserRoleService;
+
+ @Autowired
+ public SysRoleMenuService sysRoleMenuService;
+
+ /**
+ * 鑾峰彇椤甸潰
+ *
+ * @return
+ */
+ public Page getPage() {
+ int current = ServletRequestUtils.getIntParameter(req, "cuurent", 1);
+ int size = ServletRequestUtils.getIntParameter(req, "size", 10);
+
+ return new Page(current, size);
+ }
+}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
index 131b179..347731d 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
@@ -1,16 +1,23 @@
package com.mes.menu.controller;
+import cn.hutool.core.map.MapUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mes.base.BaseController;
import com.mes.menu.entity.SysMenu;
import com.mes.menu.service.SysMenuService;
+import com.mes.role.entity.SysRoleMenu;
+import com.mes.userinfo.entity.SysUser;
import com.mes.utils.Result;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -24,16 +31,102 @@
@ApiModel("鑾峰彇鑿滃崟淇℃伅")
@RestController
@RequestMapping("/menu/sysMenu")
-public class SysMenuController {
+public class SysMenuController extends BaseController {
@Autowired
SysMenuService sysMenuService;
@ApiOperation("鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鎵�鏈夎彍鍗�")
@GetMapping("/list")
- public Result<List<SysMenu>> getMenuTree() {
+ public Result<List<SysMenu>> getMenuTree(String userName) {
return Result.success(sysMenuService.getMenuTree());
}
+ @ApiOperation("鑾峰彇鐢ㄦ埛鐨勬潈闄�")
+ @GetMapping("/getAuthorityInfo")
+ public Result<List<String>> getAuthorityInfo(String userName) {
+ return Result.success(sysMenuService.getAuthorityInfo(userName));
+ }
+
+ /**
+ * 鐢ㄦ埛褰撳墠鐢ㄦ埛鐨勮彍鍗曞拰鏉冮檺淇℃伅
+ *
+ * @param userName
+ * @return
+ */
+ @GetMapping("/nav")
+ public Result nav(String userName) {
+ SysUser sysUser = sysUserService.getByUsername(userName);
+
+ // 鑾峰彇鏉冮檺淇℃伅
+ String authorityInfo = sysUserService.getUserAuthorityInfo(sysUser.getId());// ROLE_admin,ROLE_normal,sys:user:list,....
+ String[] authorityInfoArray = StringUtils.tokenizeToStringArray(authorityInfo, ",");
+
+ // 鑾峰彇瀵艰埅鏍忎俊鎭�
+ List<SysMenuDto> navs = sysMenuService.getCurrentUserNav();
+
+ return Result.success(MapUtil.builder()
+ .put("authoritys", authorityInfoArray)
+ .put("nav", navs)
+ .map()
+ );
+ }
+
+ @GetMapping("/info/{id}")
+ @PreAuthorize("hasAuthority('sys:menu:list')")
+ public Result info(@PathVariable(name = "id") Long id) {
+ return Result.success(sysMenuService.getById(id));
+ }
+
+ @GetMapping("/list")
+ @PreAuthorize("hasAuthority('sys:menu:list')")
+ public Result list() {
+
+ List<SysMenu> menus = sysMenuService.tree();
+ return Result.success(menus);
+ }
+
+ @PostMapping("/save")
+ @PreAuthorize("hasAuthority('sys:menu:save')")
+ public Result save(@Validated @RequestBody SysMenu sysMenu) {
+
+ sysMenu.setCreated(LocalDateTime.now());
+
+ sysMenuService.save(sysMenu);
+ return Result.success(sysMenu);
+ }
+
+ @PostMapping("/update")
+ @PreAuthorize("hasAuthority('sys:menu:update')")
+ public Result update(@Validated @RequestBody SysMenu sysMenu) {
+
+ sysMenu.setUpdated(LocalDateTime.now());
+
+ sysMenuService.updateById(sysMenu);
+
+ // 娓呴櫎鎵�鏈変笌璇ヨ彍鍗曠浉鍏崇殑鏉冮檺缂撳瓨
+ sysUserService.clearUserAuthorityInfoByMenuId(sysMenu.getId());
+ return Result.success(sysMenu);
+ }
+
+ @PostMapping("/delete/{id}")
+ @PreAuthorize("hasAuthority('sys:menu:delete')")
+ public Result delete(@PathVariable("id") Long id) {
+
+ int count = sysMenuService.count(new QueryWrapper<SysMenu>().eq("parent_id", id));
+ if (count > 0) {
+ return Result.fail("璇峰厛鍒犻櫎瀛愯彍鍗�");
+ }
+
+ // 娓呴櫎鎵�鏈変笌璇ヨ彍鍗曠浉鍏崇殑鏉冮檺缂撳瓨
+ sysUserService.clearUserAuthorityInfoByMenuId(id);
+
+ sysMenuService.removeById(id);
+
+ // 鍚屾鍒犻櫎涓棿鍏宠仈琛�
+ sysRoleMenuService.remove(new QueryWrapper<SysRoleMenu>().eq("menu_id", id));
+ return Result.success("");
+ }
+
}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/SysMenuService.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/SysMenuService.java
index 3b77a2e..eaea61f 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/SysMenuService.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/SysMenuService.java
@@ -15,5 +15,18 @@
*/
public interface SysMenuService extends IService<SysMenu> {
+ /**
+ * 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鑿滃崟鏍�
+ *
+ * @return
+ */
List<SysMenu> getMenuTree();
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鐨勬潈闄�
+ *
+ * @param userName
+ * @return
+ */
+ List<String> getAuthorityInfo(String userName);
}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
index 8527a36..1f8f34e 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
@@ -1,13 +1,21 @@
package com.mes.menu.service.impl;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.menu.entity.SysMenu;
import com.mes.menu.mapper.SysMenuMapper;
import com.mes.menu.service.SysMenuService;
+import com.mes.userinfo.entity.SysUser;
+import com.mes.userinfo.mapper.SysUserMapper;
+import com.mes.userinfo.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -23,10 +31,23 @@
@Slf4j
public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements SysMenuService {
+ @Autowired
+ SysUserService sysUserService;
+
@Override
public List<SysMenu> getMenuTree() {
+ //todo:闇�瑕佸厛鑾峰彇鐢ㄦ埛鐨勮鑹诧紝瑙掕壊涓嬬殑鑿滃崟鏉冮檺锛屾嬁鍒拌彍鍗昳d鑾峰彇鎵�鏈夎彍鍗�
List<SysMenu> menuList = this.baseMapper.selectList(null);
return create(menuList);
+ }
+
+ @Override
+ public List<String> getAuthorityInfo(String userName) {
+ SysUser sysUser = sysUserService.listByUserName(userName);
+
+ // 鑾峰彇鏉冮檺淇℃伅
+ String authorityInfo = sysUserService.getUserAuthorityInfo(sysUser.getId());// ROLE_admin,ROLE_normal,sys:user:list,....
+ String[] authorityInfoArray = StringUtils.tokenizeToStringArray(authorityInfo, ",");
}
@@ -64,4 +85,79 @@
return res;
}
+
+ @Autowired
+ SysUserMapper sysUserMapper;
+
+ @Override
+ public List<SysMenuDto> getCurrentUserNav() {
+ String username = (String) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ SysUser sysUser = sysUserService.getByUsername(username);
+
+ List<Long> menuIds = sysUserMapper.getNavMenuIds(sysUser.getId());
+ List<SysMenu> menus = this.listByIds(menuIds);
+
+ // 杞爲鐘剁粨鏋�
+ List<SysMenu> menuTree = buildTreeMenu(menus);
+
+ // 瀹炰綋杞珼TO
+ return convert(menuTree);
+ }
+
+ @Override
+ public List<SysMenu> tree() {
+ // 鑾峰彇鎵�鏈夎彍鍗曚俊鎭�
+ List<SysMenu> sysMenus = this.list(new QueryWrapper<SysMenu>().orderByAsc("orderNum"));
+
+ // 杞垚鏍戠姸缁撴瀯
+ return buildTreeMenu(sysMenus);
+ }
+
+ private List<SysMenuDto> convert(List<SysMenu> menuTree) {
+ List<SysMenuDto> menuDtos = new ArrayList<>();
+
+ menuTree.forEach(m -> {
+ SysMenuDto dto = new SysMenuDto();
+
+ dto.setId(m.getId());
+ dto.setName(m.getPerms());
+ dto.setTitle(m.getName());
+ dto.setComponent(m.getComponent());
+ dto.setPath(m.getPath());
+
+ if (m.getChildren().size() > 0) {
+
+ // 瀛愯妭鐐硅皟鐢ㄥ綋鍓嶆柟娉曡繘琛屽啀娆¤浆鎹�
+ dto.setChildren(convert(m.getChildren()));
+ }
+
+ menuDtos.add(dto);
+ });
+
+ return menuDtos;
+ }
+
+ private List<SysMenu> buildTreeMenu(List<SysMenu> menus) {
+
+ List<SysMenu> finalMenus = new ArrayList<>();
+
+ // 鍏堝悇鑷鎵惧埌鍚勮嚜鐨勫瀛�
+ for (SysMenu menu : menus) {
+
+ for (SysMenu e : menus) {
+ if (menu.getId() == e.getParentId()) {
+ menu.getChildren().add(e);
+ }
+ }
+
+ // 鎻愬彇鍑虹埗鑺傜偣
+ if (menu.getParentId() == 0L) {
+ finalMenus.add(menu);
+ }
+ }
+
+ System.out.println(JSONUtil.toJsonStr(finalMenus));
+ return finalMenus;
+ }
+
}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
index 943ff7d..18ee6a6 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
@@ -1,8 +1,23 @@
package com.mes.role.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.role.entity.SysRole;
+import com.mes.role.entity.SysRoleMenu;
+import com.mes.userinfo.entity.SysUserRole;
+import com.mes.utils.Result;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -15,6 +30,100 @@
@RestController
@RequestMapping("/role/sys-role")
public class SysRoleController {
+ @PreAuthorize("hasAuthority('sys:role:list')")
+ @GetMapping("/info/{id}")
+ public Result info(@PathVariable("id") Long id) {
+ SysRole sysRole = sysRoleService.getById(id);
+
+ // 鑾峰彇瑙掕壊鐩稿叧鑱旂殑鑿滃崟id
+ List<SysRoleMenu> roleMenus = sysRoleMenuService.list(new QueryWrapper<SysRoleMenu>().eq("role_id", id));
+ List<Long> menuIds = roleMenus.stream().map(p -> p.getMenuId()).collect(Collectors.toList());
+
+ sysRole.setMenuIds(menuIds);
+ return Result.success(sysRole);
+ }
+
+ @PreAuthorize("hasAuthority('sys:role:list')")
+ @GetMapping("/list")
+ public Result list(String name) {
+
+ Page<SysRole> pageData = sysRoleService.page(getPage(),
+ new QueryWrapper<SysRole>()
+ .like(StrUtil.isNotBlank(name), "name", name)
+ );
+
+ return Result.success(pageData);
+ }
+
+ @PostMapping("/save")
+ @PreAuthorize("hasAuthority('sys:role:save')")
+ public Result save(@Validated @RequestBody SysRole sysRole) {
+
+ sysRole.setCreated(LocalDateTime.now());
+ sysRole.setStatu(Const.STATUS_ON);
+
+ sysRoleService.save(sysRole);
+ return Result.success(sysRole);
+ }
+
+ @PostMapping("/update")
+ @PreAuthorize("hasAuthority('sys:role:update')")
+ public Result update(@Validated @RequestBody SysRole sysRole) {
+
+ sysRole.setUpdated(LocalDateTime.now());
+
+ sysRoleService.updateById(sysRole);
+
+ // 鏇存柊缂撳瓨
+ sysUserService.clearUserAuthorityInfoByRoleId(sysRole.getId());
+
+ return Result.success(sysRole);
+ }
+
+ @PostMapping("/delete")
+ @PreAuthorize("hasAuthority('sys:role:delete')")
+ @Transactional
+ public Result info(@RequestBody Long[] ids) {
+
+ sysRoleService.removeByIds(Arrays.asList(ids));
+
+ // 鍒犻櫎涓棿琛�
+ sysUserRoleService.remove(new QueryWrapper<SysUserRole>().in("role_id", ids));
+ sysRoleMenuService.remove(new QueryWrapper<SysRoleMenu>().in("role_id", ids));
+
+ // 缂撳瓨鍚屾鍒犻櫎
+ Arrays.stream(ids).forEach(id -> {
+ // 鏇存柊缂撳瓨
+ sysUserService.clearUserAuthorityInfoByRoleId(id);
+ });
+
+ return Result.success("");
+ }
+
+ @Transactional
+ @PostMapping("/perm/{roleId}")
+ @PreAuthorize("hasAuthority('sys:role:perm')")
+ public Result info(@PathVariable("roleId") Long roleId, @RequestBody Long[] menuIds) {
+
+ List<SysRoleMenu> sysRoleMenus = new ArrayList<>();
+
+ Arrays.stream(menuIds).forEach(menuId -> {
+ SysRoleMenu roleMenu = new SysRoleMenu();
+ roleMenu.setMenuId(menuId);
+ roleMenu.setRoleId(roleId);
+
+ sysRoleMenus.add(roleMenu);
+ });
+
+ // 鍏堝垹闄ゅ師鏉ョ殑璁板綍锛屽啀淇濆瓨鏂扮殑
+ sysRoleMenuService.remove(new QueryWrapper<SysRoleMenu>().eq("role_id", roleId));
+ sysRoleMenuService.saveBatch(sysRoleMenus);
+
+ // 鍒犻櫎缂撳瓨
+ sysUserService.clearUserAuthorityInfoByRoleId(roleId);
+
+ return Result.success(menuIds);
+ }
}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index 4351325..727c0dc 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -1,14 +1,14 @@
package com.mes.userinfo.controller;
+import com.mes.base.BaseController;
import com.mes.userinfo.entity.SysUser;
import com.mes.userinfo.entity.request.UserRequest;
import com.mes.userinfo.entity.vo.SysUserVO;
-import com.mes.userinfo.service.SysUserService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,10 +28,7 @@
@ApiModel("鐢ㄦ埛淇℃伅")
@RestController
@RequestMapping("/userinfo")
-public class SysUserController {
-
- @Autowired
- private SysUserService sysUserService;
+public class SysUserController extends BaseController {
@ApiOperation("鐢ㄦ埛鐧诲綍")
@PostMapping("/login")
@@ -47,28 +44,39 @@
@ApiOperation("鏂板鐢ㄦ埛淇℃伅")
@PostMapping("/saveUser")
- public Result<SysUserVO> saveUser(@RequestBody SysUserVO sysUser) {
+// @PreAuthorize("hasAuthority('sys:user:save')")
+ public Result<String> saveUser(@Validated @RequestBody SysUserVO sysUser) {
return Result.success(sysUserService.saveUser(sysUser));
}
+
+ @ApiOperation("鏇存柊鐢ㄦ埛淇℃伅")
+ @PostMapping("/updateUser")
+// @PreAuthorize("hasAuthority('sys:user:update')")
+ public Result<SysUserVO> updateUser(@Validated @RequestBody SysUserVO sysUser) {
+ return Result.success(sysUserService.updateUser(sysUser));
+ }
+
+ @PostMapping("/resetPassword")
+// @PreAuthorize("hasAuthority('sys:user:resetPassword')")
+ public Result resetPassword(@RequestBody Long userId) {
+ return Result.success(sysUserService.resetPassword(userId));
+ }
+
+
@ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
@PostMapping("/listByUserName")
+// @PreAuthorize("hasAuthority('sys:user:list')")
public Result<List<SysUserVO>> listByUserName(@RequestBody UserRequest request) {
return Result.success(sysUserService.listByUserName(request));
}
- @ApiOperation("鏇存柊鐢ㄦ埛淇℃伅")
- @PostMapping("/updateUser")
- public Result<SysUserVO> updateUser(@RequestBody SysUserVO sysUser) {
- return Result.success(sysUserService.updateUser(sysUser));
- }
-
@ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅")
@PostMapping("/deleteUser")
- public Result<String> deleteUser(@RequestBody SysUserVO sysUser) {
- return Result.success(sysUserService.deleteUser(sysUser));
+// @PreAuthorize("hasAuthority('sys:user:delete')")
+ public Result<String> deleteUser(@RequestBody List<Long> ids) {
+ return Result.success(sysUserService.deleteUser(ids));
}
-
}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserRoleController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserRoleController.java
deleted file mode 100644
index 8d6e6a7..0000000
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserRoleController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.userinfo.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-11
- */
-@RestController
-@RequestMapping("/userinfo/sys-user-role")
-public class SysUserRoleController {
-
-}
-
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/entity/SysUserRole.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/entity/SysUserRole.java
index 4d76c57..c6ff26f 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/entity/SysUserRole.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/entity/SysUserRole.java
@@ -1,7 +1,6 @@
package com.mes.userinfo.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,6 +16,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
public class SysUserRole implements Serializable {
private static final long serialVersionUID = 1L;
@@ -24,7 +24,6 @@
/**
* 鐢ㄦ埛id
*/
- @TableId(value = "user_id", type = IdType.AUTO)
private Long userId;
/**
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/SysUserService.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/SysUserService.java
index 83caa2d..419b4c7 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/SysUserService.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/SysUserService.java
@@ -39,15 +39,23 @@
* @param user
* @return
*/
- SysUserVO saveUser(SysUserVO user);
+ String saveUser(SysUserVO user);
/**
- * 鎸夊悕绉拌幏鍙栫敤鎴蜂俊鎭�
+ * 鏇存柊鐢ㄦ埛淇℃伅
*
* @param sysUser
* @return
*/
SysUserVO updateUser(SysUserVO sysUser);
+
+ /**
+ * 閲嶇疆瀵嗙爜
+ *
+ * @param userId
+ * @return
+ */
+ String resetPassword(Long userId);
/**
* 鎸夊悕绉拌幏鍙栫敤鎴蜂俊鎭�
@@ -60,8 +68,8 @@
/**
* 鍒犻櫎鐢ㄦ埛淇℃伅
*
- * @param user
+ * @param ids
* @return
*/
- String deleteUser(SysUserVO user);
+ String deleteUser(List<Long> ids);
}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
index b8f3259..001b1fa 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
@@ -1,15 +1,24 @@
package com.mes.userinfo.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.common.config.Const;
import com.mes.common.utils.JwtUtil;
import com.mes.common.utils.RedisUtil;
import com.mes.menu.mapper.SysMenuMapper;
+import com.mes.role.entity.SysRole;
import com.mes.userinfo.entity.LoginUser;
import com.mes.userinfo.entity.SysUser;
+import com.mes.userinfo.entity.SysUserRole;
+import com.mes.userinfo.entity.request.UserRequest;
+import com.mes.userinfo.entity.vo.SysUserVO;
import com.mes.userinfo.mapper.SysUserMapper;
+import com.mes.userinfo.service.SysUserRoleService;
import com.mes.userinfo.service.SysUserService;
-import com.mes.utils.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -18,12 +27,15 @@
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -34,18 +46,26 @@
* @since 2024-04-11
*/
@Service
+@Slf4j
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService, UserDetailsService {
@Autowired
private AuthenticationManager authenticationManager;
+
@Autowired
private RedisUtil redisUtil;
@Resource
private SysMenuMapper sysMenuMapper;
+ @Resource
+ private SysUserRoleService sysUserRoleService;
+
+ @Autowired
+ BCryptPasswordEncoder passwordEncoder;
+
@Override
- public Result login(SysUser user) {
+ public Map<String, String> login(SysUser user) {
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(user.getUserName(), user.getPassword());
Authentication authenticate = authenticationManager.authenticate(authenticationToken);
if (Objects.isNull(authenticate)) {
@@ -54,24 +74,93 @@
//浣跨敤userid鐢熸垚token
LoginUser loginUser = (LoginUser) authenticate.getPrincipal();
String userId = loginUser.getUser().getId().toString();
- String jwt = JwtUtil.generateToken(userId);
+ String jwt = JwtUtil.createJWT(userId);
+
+ //鏌ヨ鏉冮檺淇℃伅
+// List<String> perms = sysMenuMapper.selectPermsByUserId(userId);
//authenticate瀛樺叆redis
- redisUtil.setCacheObject("login:" + userId, loginUser);
+ redisUtil.setCacheObject("login:" + userId, loginUser.getAuthorities());
//鎶妕oken鍝嶅簲缁欏墠绔�
HashMap<String, String> map = new HashMap<>();
map.put("token", jwt);
- return Result.success(map);
+ return map;
}
@Override
- public Result logout() {
+ public String logout() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
Long userid = loginUser.getUser().getId();
redisUtil.deleteObject("login:" + userid);
- return Result.success("閫�鍑烘垚鍔�");
+ return "娉ㄩ攢鎴愬姛";
}
+ @Transactional
+ @Override
+ public String saveUser(SysUserVO user) {
+ log.info("淇濆瓨鐢ㄦ埛淇℃伅");
+ // 榛樿瀵嗙爜
+ String password = passwordEncoder.encode(Const.DEFULT_PASSWORD);
+ user.setPassword(password);
+ SysUser sysUser = new SysUser();
+ BeanUtils.copyProperties(user, sysUser);
+ this.save(sysUser);
+ saveUserRole(user.getRoleList(), sysUser.getId());
+ return "success";
+ }
+
+ @Transactional
+ @Override
+ public SysUserVO updateUser(SysUserVO user) {
+ log.info("鏇存柊鐢ㄦ埛淇℃伅");
+ SysUser sysUser = new SysUser();
+ BeanUtils.copyProperties(user, sysUser);
+ this.updateById(sysUser);
+ log.info("鍒犻櫎鐢ㄦ埛瑙掕壊淇℃伅");
+ sysUserRoleService.removeByIds(user.getRoleList());
+ log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅");
+ saveUserRole(user.getRoleList(), sysUser.getId());
+ return null;
+ }
+
+ @Override
+ public String resetPassword(Long userId) {
+ log.info("閲嶇疆瀵嗙爜涓簕}", Const.DEFULT_PASSWORD);
+ SysUser sysUser = new SysUser();
+ sysUser.setId(userId);
+ String password = passwordEncoder.encode(Const.DEFULT_PASSWORD);
+ sysUser.setPassword(password);
+ this.updateById(sysUser);
+ return "success";
+ }
+
+ @Override
+ public List<SysUserVO> listByUserName(UserRequest request) {
+ MPJLambdaWrapper<SysUser> wrapper = new MPJLambdaWrapper<>();
+ wrapper.selectAll(SysUser.class)
+ .selectCollection(SysRole.class, SysUserVO::getRoleList)
+ .leftJoin(SysUserRole.class, SysUserRole::getUserId, SysUser::getId)
+ .leftJoin(SysRole.class, SysRole::getId, SysUserRole::getRoleId)
+ .like(StringUtils.hasText(request.getUserName()), SysUser::getUserName, request.getUserName());
+ return baseMapper.selectJoinList(SysUserVO.class, wrapper);
+ }
+
+ @Transactional
+ @Override
+ public String deleteUser(List<Long> ids) {
+ this.removeByIds(ids);
+ sysUserRoleService.remove(new QueryWrapper<SysUserRole>().in("user_id", ids));
+ return "success";
+
+ }
+
+ /**
+ * 瀹炵幇UserDetailsService鎺ュ彛锛屼粠鏁版嵁搴撳唴鑾峰彇鐢ㄦ埛鍙婃潈闄愪俊鎭�
+ *
+ * @param username
+ * @return
+ * @throws UsernameNotFoundException
+ */
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
@@ -86,4 +175,19 @@
return new LoginUser(user, perms);
}
+
+
+ private void saveUserRole(List<SysRole> roles, Long userId) {
+ log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅");
+ List<SysUserRole> userRoles = new ArrayList<>();
+ if (CollectionUtils.isEmpty(roles)) {
+ log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅涓虹┖锛岀粰榛樿鏅�氱敤鎴疯鑹�");
+ userRoles.add(new SysUserRole(userId, Const.DEFULT_ROLE));
+ } else {
+ log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅");
+ userRoles = roles.stream().map(e -> new SysUserRole(userId, e.getId())).collect(Collectors.toList());
+ }
+ sysUserRoleService.saveBatch(userRoles);
+ }
+
}
--
Gitblit v1.8.0