From 1d42a3d92d35a0cedb45cbd926cbac0c0067d52b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 16 Sep 2021 08:49:51 +0800
Subject: [PATCH] screen-api 修改判断无人机名称bug
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 120 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 66 insertions(+), 54 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 9a82667..161de75 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
@@ -1,9 +1,11 @@
package com.moral.api.service.impl;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -57,6 +59,7 @@
* @since 2021-03-09
*/
@Service
+@Slf4j
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
@Autowired
@@ -76,7 +79,6 @@
@Value("${AES.KEY}")
private String AESKey;
-
@Override
public UserBO selectUserInfo(Map<String, Object> parameters) {
@@ -137,14 +139,14 @@
userInfo.put("organization", orgInfo);
//���������������
- List<Map<String, Object>> groups = new ArrayList<>();
- for (Group group : userBo.getGroups()) {
- HashMap<String, Object> groupMap = new LinkedHashMap<>();
+ Group group = userBo.getGroup();
+ Map<String, Object> groupMap = new LinkedHashMap<>();
+ userInfo.put("group", groupMap);
+ if (group != null) {
groupMap.put("id", group.getId());
groupMap.put("groupName", group.getGroupName());
- groups.add(groupMap);
+ userInfo.put("group", groupMap);
}
- userInfo.put("groups", groups);
Map<String, Object> map = new HashMap<>();
map.put("userId", userBo.getId());
@@ -153,14 +155,12 @@
try {
//������token������������redis
String token = TokenUtils.getToken(userBo.getId().toString(), userInfo);
- Map<String, Object> data = new HashMap<>();
- data.put("token", token);
- data.put("user", userInfo);
- result.put("data", data);
+ result.put("token", token);
} catch (Exception e) {
log.error("token���������������" + e.getMessage());
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
result.put("msg", ResponseCodeEnum.TOKEN_CREATE_ERROR.getMsg());
+ return result;
}
//������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
@@ -175,12 +175,19 @@
}
@Override
+ public Map<String, Object> getCurrentUserInfo() {
+ Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ return userInfo;
+ }
+
+ @Override
public Map<String, Object> getMenus(Map<String, Object> parameters) {
List<Menu> allMenus;
if (parameters.containsKey("userId")) {
allMenus = menuMapper.selectUserMenu(Integer.parseInt(parameters.get("userId").toString()));
} else {
allMenus = menuMapper.selectOrganizationMenu(Integer.parseInt(parameters.get("orgId").toString()));
+ allMenus.removeIf(m -> "������������".equals(m.getName()));
}
Map<String, Object> resultMap = new LinkedHashMap<>();
@@ -195,10 +202,10 @@
oneMenu.forEach(o -> {
Map<String, Object> menuMap = new LinkedHashMap<>();
menuMap.put("id", o.getId());
- menuMap.put("name", o.getName());
+ menuMap.put("label", o.getName());
menuMap.put("url", o.getUrl());
menuMap.put("icon", o.getIcon());
- menuMap.put("child", getMenusByRecursion(o, allMenus));
+ menuMap.put("children", getMenusByRecursion(o, allMenus));
newList.add(menuMap);
});
resultMap.put("menus", newList);
@@ -219,11 +226,11 @@
nextLevelMenus.forEach(o -> {
Map<String, Object> menuMap = new LinkedHashMap<>();
menuMap.put("id", o.getId());
- menuMap.put("name", o.getName());
+ menuMap.put("label", o.getName());
menuMap.put("url", o.getUrl());
menuMap.put("icon", o.getIcon());
//���������������
- menuMap.put("child", getMenusByRecursion(o, menus));
+ menuMap.put("children", getMenusByRecursion(o, menus));
list.add(menuMap);
});
}
@@ -233,33 +240,32 @@
@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);
//������������������������
- if (user.selectOne(queryWrapper) != null) {
+ if (user.selectCount(queryWrapper) > 0) {
result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode());
result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
return result;
}
- //������������������
+ //������������
if (!RegexUtils.checkAccount(user.getAccount())) {
result.put("code", ResponseCodeEnum.ACCOUNT_INVALID.getCode());
result.put("msg", ResponseCodeEnum.ACCOUNT_INVALID.getMsg());
return result;
}
- //������������������
- if (user.getEmail() != null && !RegexUtils.checkEmail(user.getEmail())) {
+
+ //������������
+ if (!ObjectUtils.isEmpty(user.getEmail()) && !RegexUtils.checkEmail(user.getEmail())) {
result.put("code", ResponseCodeEnum.EMAIL_INVALID.getCode());
result.put("msg", ResponseCodeEnum.EMAIL_INVALID.getMsg());
return result;
}
- //������������������
+ //������������
String password = user.getPassword();
//������������
password = AESUtils.decrypt(password, AESKey);
@@ -268,8 +274,8 @@
result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
return result;
}
- //���������������������
- if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
+ //���������������
+ if (!ObjectUtils.isEmpty(user.getMobile()) && !RegexUtils.checkMobile(user.getMobile())) {
result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode());
result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
return result;
@@ -298,57 +304,65 @@
userMapper.insert(user);
//������
String content = "������������������" + user.getAccount();
- operationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
+ operationLogUtils.insertLog(content, Constants.INSERT_OPERATE_TYPE);
return result;
}
@Override
@Transactional
- public void deleteUser(User user) {
- String userId = user.getId().toString();
+ public void deleteUser(Integer userId) {
+ User user = userMapper.selectById(userId);
//������������user
- user.setIsDelete(Constants.DELETE);
- userMapper.updateById(user);
+ UpdateWrapper<User> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", userId).set("is_delete", Constants.DELETE);
+ userMapper.update(null, updateWrapper);
//������user_group
UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>();
deleteWrapper.eq("user_id", userId);
userGroupMapper.delete(deleteWrapper);
- //������redis
- if (TokenUtils.hHasKey(userId)) {
- String token = TokenUtils.hget(userId).toString();
- TokenUtils.destoryToken(userId, token);
+ //������redis
+ if (TokenUtils.hHasKey(userId.toString())) {
+ String token = TokenUtils.hget(userId.toString()).toString();
+ 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> result = new HashMap<>();
- 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();
+ /*String account = beforeUser.getAccount();
//account������������
- user.setAccount(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());
+ if (userMapper.selectCount(queryWrapper) > 0) {
+ result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode());
+ result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
+ return result;
+ }
+ }
//������������
- if (user.getEmail() != null && !RegexUtils.checkEmail(user.getEmail())) {
+ if (!ObjectUtils.isEmpty(user.getEmail()) && !RegexUtils.checkEmail(user.getEmail())) {
result.put("code", ResponseCodeEnum.EMAIL_INVALID.getCode());
result.put("msg", ResponseCodeEnum.EMAIL_INVALID.getMsg());
return result;
}
//������������
String password = user.getPassword();
- if (password != null) {
+ System.out.println("password==" + password);
+ if (!ObjectUtils.isEmpty(password)) {
//������������
password = AESUtils.decrypt(password, AESKey);
if (!RegexUtils.checkPassword(password)) {
@@ -359,7 +373,7 @@
}
//���������������������
- if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
+ if (!ObjectUtils.isEmpty(user.getMobile()) && !RegexUtils.checkMobile(user.getMobile())) {
result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode());
result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
return result;
@@ -403,21 +417,19 @@
content.append(key).append(":").append(beforeValue).append("=>").append(afterValue).append(";");
}
}
- operationLogUtils.insertLog(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
-
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ 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"))
- .eq("is_delete", Constants.NOT_DELETE);
+ .eq("is_delete", Constants.NOT_DELETE)
+ .eq("is_admin", false);
Object order = parameters.get("order");
Object orderType = parameters.get("orderType");
Object account = parameters.get("account");
@@ -442,8 +454,8 @@
queryWrapper.like("wechat", wechat);
}
- Integer page = (Integer) parameters.get("page");
- Integer size = (Integer) parameters.get("size");
+ int page = Integer.parseInt(parameters.get("page").toString());
+ int size = Integer.parseInt(parameters.get("size").toString());
Page<User> pageData = new Page<>(page, size);
//������������,������create_time������
if (order != null && orderType != null) {
--
Gitblit v1.8.0