From 064457406bda554e713aea8bada1bb066be42b8e Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 23 九月 2023 12:39:29 +0800
Subject: [PATCH] 9-23 去鵷雏管理端验证
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 73 +++++++++++++++++-------------------
1 files changed, 34 insertions(+), 39 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 72e2822..2c02d9c 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,18 +4,19 @@
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.mapper.RoleManageMapper;
+import com.yuanchu.limslaboratory.mapper.UserMapper;
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.UpdatePersonnelVo;
+import com.yuanchu.limslaboratory.service.UserService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.JsonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -49,21 +50,13 @@
Object obj = RedisUtil.get(token);
if (!ObjectUtils.isEmpty(obj)){
Map loginUser = (Map) obj;
- Map map = (Map)loginUser.get("data");
- Object residualTime = map.get("residualTime");
- int i = Integer.parseInt(residualTime.toString());
- String remind = null;
- if (i <= 30) {
- remind = "鎮ㄦ墍浣跨敤鐨勭郴缁熷嵆灏嗚繃鏈燂紒璇疯仈绯荤鐞嗗憳锛�";
- }
Map<String, Object> data = new HashMap<>();
data.put("name",loginUser.get("name"));
+ data.put("account", loginUser.get("account"));
data.put("id",loginUser.get("id"));
- data.put("remind", remind);
+ data.put("roleId",loginUser.get("roleId"));
+ data.put("sessionLayerId",loginUser.get("sessionLayerId"));
RoleAndMenuDto role = getRoleInfo(Long.valueOf(String.valueOf(loginUser.get("roleId"))));
- System.out.println("+++++++++++++++++++++++++++++++++++++++++++++");
- System.out.println(role);
- System.out.println("++++++++++++++++++++++++++++++++++++++++++++++");
data.put("role",role);
return data;
}
@@ -94,10 +87,16 @@
}
@Override
- public List<Map<String, Object>> getUserNameAndId() {
+ public List<Map<String, Object>>
+ getUserNameAndId() {
LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(User::getId, User::getName);
+ wrapper.select(User::getId, User::getName).eq(User::getType,1);
return userMapper.selectMaps(wrapper);
+ }
+
+ @Override
+ public RoleAndMenuDto getUserRoleInfo(String token) {
+ return null;
}
@Override
@@ -115,39 +114,35 @@
@Override
public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {
+ User unmarshal = JsonUtil.jsonToPojo(JsonUtil.jsonToString(newPersonnelVo), User.class);
+ unmarshal.setEnterpriseId(Integer.valueOf(enterpriseId));
+ return userMapper.insert(unmarshal);
+ }
+
+ @Override
+ public Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo) {
try {
- User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(newPersonnelVo), User.class);
- unmarshal.setEnterpriseId(Integer.valueOf(enterpriseId));
- return userMapper.insert(unmarshal);
+ 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 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);
- }
-
- @Override
public IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status) {
- MyUtil.PrintLog(name + status + "=============");
return userMapper.getNewPersonnelPage(name, page, status);
}
public RoleAndMenuDto getRoleInfo(Long roleId) {
+ if(roleId==0){
+ return null;
+ }
RoleAndMenuDto roleAndMenuDto = roleManageMapper.selectAllRoleAndMenuByRoleId(roleId);
List<RoleMenu> collect = roleAndMenuDto.getRoleMenuList()
.stream()
--
Gitblit v1.9.3