From 1865de1cd0255f7c42a326018a8cc3b5a1ee5253 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 09:03:26 +0800
Subject: [PATCH] 权限
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 794b6ab..9ec7650 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -4,15 +4,17 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.mapper.RoleManageMapper;
+import com.yuanchu.limslaboratory.pojo.RoleMenu;
import com.yuanchu.limslaboratory.pojo.User;
import com.yuanchu.limslaboratory.mapper.UserMapper;
+import com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto;
import com.yuanchu.limslaboratory.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -21,6 +23,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -35,6 +39,9 @@
@Resource
private UserMapper userMapper;
+
+ @Resource
+ private RoleManageMapper roleManageMapper;
@Override
public Map<String, Object> getUserInfo(String token) {
@@ -52,7 +59,10 @@
Map<String, Object> data = new HashMap<>();
data.put("name",loginUser.get("name"));
data.put("id",loginUser.get("id"));
+ data.put("roleId",loginUser.get("roleId"));
data.put("remind", remind);
+ RoleAndMenuDto role = getRoleInfo(Long.valueOf(String.valueOf(loginUser.get("roleId"))));
+ data.put("role",role);
return data;
}
return null;
@@ -89,6 +99,11 @@
}
@Override
+ public RoleAndMenuDto getUserRoleInfo(String token) {
+ return null;
+ }
+
+ @Override
public Map<String, String> selectUserByUserId(int userId) {
return userMapper.selectUserByUserId(userId);
}
@@ -97,7 +112,7 @@
public User AccordingUsernameSelectAll(String account) {
LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(User::getAccount, account);
- wrapper.select(User::getPassword, User::getId, User::getName, User::getAccount, User::getEnterpriseId);
+ wrapper.select(User::getPassword, User::getRoleId,User::getId, User::getName, User::getAccount, User::getEnterpriseId);
return userMapper.selectOne(wrapper);
}
@@ -114,23 +129,43 @@
@Override
public Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo) {
- User user = new User()
- .setName(updatePersonnelVo.getName())
- .setAccount(updatePersonnelVo.getAccount())
- .setAge(String.valueOf(updatePersonnelVo.getAge()))
- .setPhone(updatePersonnelVo.getPhone())
- .setEmail(updatePersonnelVo.getEmail())
- .setRoleId(updatePersonnelVo.getRole_id())
- .setPassword(updatePersonnelVo.getPassword())
- .setJobState(updatePersonnelVo.getJobState());
- LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(User::getId, updatePersonnelVo.getId());
- return userMapper.update(user, updateWrapper);
+ try {
+ MyUtil.PrintLog(updatePersonnelVo.toString());
+ User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(updatePersonnelVo), User.class);
+
+ LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(User::getId, updatePersonnelVo.getId());
+ return userMapper.update(unmarshal, updateWrapper);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
@Override
- public IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page, Integer status) {
- MyUtil.PrintLog(name + status + "=============");
+ public IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status) {
return userMapper.getNewPersonnelPage(name, page, status);
}
+
+
+ public RoleAndMenuDto getRoleInfo(Long roleId) {
+ RoleAndMenuDto roleAndMenuDto = roleManageMapper.selectAllRoleAndMenuByRoleId(roleId);
+ List<RoleMenu> collect = roleAndMenuDto.getRoleMenuList()
+ .stream()
+ .filter(t -> t.getParentId() == 0)
+ .peek((menu) -> menu.setChildren(this.getRoleMenuChildren(menu, roleAndMenuDto.getRoleMenuList())))
+ .collect(Collectors.toList());
+ roleAndMenuDto.setRoleMenuList(collect);
+ return roleAndMenuDto;
+ }
+
+
+ private List<RoleMenu> getRoleMenuChildren(RoleMenu root, List<RoleMenu> all) {
+ return all.stream()
+ .filter(t -> Objects.equals(t.getParentId(), root.getMenuId()))
+ .peek(g -> {
+ //鎵惧瓙鑿滃崟
+ g.setChildren(getRoleMenuChildren(g, all));
+ })
+ .collect(Collectors.toList());
+ }
}
--
Gitblit v1.9.3