From ba55d44ea9f61a007f5c63fb8689488cc35d48ee Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Mon, 26 Sep 2022 15:05:56 +0800
Subject: [PATCH] 多站单参接口修改
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 54 +++++++++++++++++++++---------------------------------
1 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index b3a584b..a47ccf5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -119,7 +119,7 @@
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
- //������in���
+ //������������
userInfo.put("userId", userBo.getId());
userInfo.put("account", userBo.getAccount());
userInfo.put("userName", userBo.getUserName());
@@ -140,12 +140,13 @@
//���������������
Group group = userBo.getGroup();
-
- HashMap<String, Object> groupMap = new LinkedHashMap<>();
- groupMap.put("id", group.getId());
- groupMap.put("groupName", group.getGroupName());
-
+ Map<String, Object> groupMap = new LinkedHashMap<>();
userInfo.put("group", groupMap);
+ if (group != null) {
+ groupMap.put("id", group.getId());
+ groupMap.put("groupName", group.getGroupName());
+ userInfo.put("group", groupMap);
+ }
Map<String, Object> map = new HashMap<>();
map.put("userId", userBo.getId());
@@ -174,8 +175,8 @@
}
@Override
- public Map<String, Object> getUserInfo(String token) {
- Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ public Map<String, Object> getCurrentUserInfo() {
+ Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
return userInfo;
}
@@ -218,6 +219,7 @@
//������������������������������
List<Menu> nextLevelMenus = menus.stream()
.filter(o -> o.getParentId().equals(menu.getId()))
+ .sorted(Comparator.comparing(Menu::getOrder))
.collect(Collectors.toList());
List<Map<String, Object>> list = new ArrayList<>();
if (nextLevelMenus.size() > 0) {
@@ -239,11 +241,9 @@
@Override
@Transactional
public Map<String, Object> addUser(User user) {
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
- String token = request.getHeader("token");
Map<String, Object> result = new HashMap<>();
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("account", user.getAccount()).eq("is_delete", Constants.NOT_DELETE);
@@ -305,7 +305,7 @@
userMapper.insert(user);
//������
String content = "������������������" + user.getAccount();
- operationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
+ operationLogUtils.insertLog(content, Constants.INSERT_OPERATE_TYPE);
return result;
}
@@ -327,27 +327,22 @@
TokenUtils.destoryToken(userId.toString(), token);
}
//������
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
String content = "������������������" + user.getAccount();
- operationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
+ operationLogUtils.insertLog(content, Constants.DELETE_OPERATE_TYPE);
}
@Override
@Transactional
public Map<String, Object> updateUser(User user) {
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
- String token = request.getHeader("token");
-
Map<String, Object> result = new HashMap<>();
//���������������
Map<String, Object> update = JSONObject.parseObject(JSON.toJSONString(user), Map.class);
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
User beforeUser = userMapper.selectById(user.getId());
Map<String, Object> before = JSONObject.parseObject(JSON.toJSONString(beforeUser), Map.class);
/*String account = beforeUser.getAccount();
//account������������
user.setAccount(account);*/
- System.out.println(user);
if (!ObjectUtils.isEmpty(user.getAccount())) {
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("account", user.getAccount());
@@ -366,7 +361,6 @@
}
//������������
String password = user.getPassword();
- System.out.println("password==" + password);
if (!ObjectUtils.isEmpty(password)) {
//������������
password = AESUtils.decrypt(password, AESKey);
@@ -395,13 +389,9 @@
Date orgExpireTime = DateUtils.getDate((String) orgInfo.get("expireTime"), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
if (userExpireTime != null) {
if (orgExpireTime != null && userExpireTime.getTime() > orgExpireTime.getTime()) {
- user.setExpireTime(orgExpireTime);
- } else {
- user.setExpireTime(userExpireTime);
- }
- } else {
- if (orgExpireTime != null) {
- user.setExpireTime(orgExpireTime);
+ result.put("code", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getCode());
+ result.put("msg", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getMsg());
+ return result;
}
}
//������redis
@@ -413,7 +403,8 @@
userMapper.updateById(user);
//������
- StringBuilder content = new StringBuilder("������������������" + user.getAccount() + "->");
+ String account = userMapper.selectById(userId).getAccount();
+ StringBuilder content = new StringBuilder("������������������" + account + "->");
for (String key : update.keySet()) {
Object afterValue = update.get(key);
if (!key.equals("id") && afterValue != null) {
@@ -422,16 +413,13 @@
content.append(key).append(":").append(beforeValue).append("=>").append(afterValue).append(";");
}
}
- operationLogUtils.insertLog(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ operationLogUtils.insertLog(content.toString(), Constants.UPDATE_OPERATE_TYPE);
return result;
}
@Override
public Page<User> selectUsers(Map<String, Object> parameters) {
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
- String token = request.getHeader("token");
-
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("organization_id", orgInfo.get("id"))
--
Gitblit v1.8.0