Merge remote-tracking branch 'origin/dev' into dev

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java

@@ -2,6 +2,7 @@

import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -9,22 +10,31 @@
import java.util.stream.Collectors;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Group;
import com.moral.api.entity.Menu;
import com.moral.api.entity.Organization;
import com.moral.api.entity.User;

import com.moral.api.mapper.GroupMapper;
import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.MenuMapper;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.mapper.UserGroupMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.UserBo;
import com.moral.api.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.AESUtils;
import com.moral.util.MD5Utils;
import com.moral.util.RegexUtils;
import com.moral.util.TokenUtils;

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;

/**
 * <p>
@@ -41,69 +51,96 @@
    private UserMapper userMapper;

    @Autowired
    private GroupMapper groupMapper;

    @Autowired
    private MenuMapper menuMapper;

    @Autowired
    private OrganizationMapper organizationMapper;
    private UserGroupMapper userGroupMapper;

    @Value("${AES.KEY}")
    private String AESKey;

    @Override
    public Map<String, Object> login(Map<String, Object> parameters) {
        Map<String, Object> resultMap = new LinkedHashMap<>();
        //接收参数
        String account = parameters.get("account").toString();
        String password = parameters.get("password").toString();
        //解密
        account = AESUtils.decrypt(account, AESKey);
        password = AESUtils.decrypt(password, AESKey);
        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
        //校验账户
        queryWrapper.eq("account", account);
        User user = userMapper.selectOne(queryWrapper);
        String msg;
        if (user == null) {
            msg = "用户名不存在";
        } else {
            if (!MD5Utils.saltMD5Verify(password, user.getPassword())) {//校验密码
                msg = "密码错误";
            } else if ("1".equals(user.getIsDelete())) {
                msg = "账户已被删除";
            } else if (user.getExpireTime() != null && user.getExpireTime().getTime() < System.currentTimeMillis()) {
                msg = "你的账户已过期";
            } else {
                int userId = user.getId();
                //查询地图等级
                Map<String, Object> orgMap = organizationMapper.selectOrganizationById(user.getOrganizationId());
                String locationCode = orgMap.get(orgMap.get("location_level").toString()).toString();
                //封装用户信息
                Map<String, Object> userInfo = new LinkedHashMap<>();
                userInfo.put("userId", userId);
                userInfo.put("account", user.getAccount());
                userInfo.put("userName", user.getUserName());
                userInfo.put("organizationId", user.getOrganizationId());
                userInfo.put("locationCode", locationCode);
                List<Map<String, Object>> groups = groupMapper.selectUserGroup(userId);
                userInfo.put("groups", groups);
                userInfo.putAll(getMenus(userId));
                //生成token，并存入redis
                String token = TokenUtils.getToken(user.getId().toString(), userInfo);
                resultMap.put("token", token);
                resultMap.putAll(userInfo);
                return resultMap;
            }
        }
        resultMap.put("msg", msg);
        return resultMap;
    public UserBo selectUserInfo(Map<String, Object> parameters) {
        return userMapper.selectUserInfo(parameters);
    }

    //根据userId获取用户层级菜单
    private Map<String, Object> getMenus(int userId) {
        List<Menu> allMenus = menuMapper.selectUserMenu(userId);
    @Override
    public Map<String, Object> login(Map<String, Object> parameters) {
        UserBo userBo = selectUserInfo(parameters);
        Map<String, Object> result = new HashMap<>();
        //校验账户
        if (userBo == null) {
            result.put("code", ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
            result.put("msg", ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
            return result;
        }
        //校验密码
        String password = parameters.get("password").toString();
        //密码解密
        password = AESUtils.decrypt(password, AESKey);
        if (!MD5Utils.saltMD5Verify(password, userBo.getPassword())) {
            result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
            result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
            return result;
        }
        //校验是否删除
        if (Constants.DELETE.equals(userBo.getIsDelete())) {
            result.put("code", ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode());
            result.put("msg", ResponseCodeEnum.ACCOUNT_IS_DELETE.getMsg());
            return result;
        }
        //校验是否过期
        if (userBo.getExpireTime() != null && userBo.getExpireTime().getTime() < System.currentTimeMillis()) {
            result.put("code", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getCode());
            result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg());
            return result;
        }
        //封装用户信息
        Map<String, Object> userInfo = new LinkedHashMap<>();
        List<Map<String, Object>> groups = new ArrayList<>();
        for (Group group : userBo.getGroups()) {
            HashMap<String, Object> groupMap = new HashMap<>();
            groupMap.put("groupId", group.getId());
            groupMap.put("groupName", group.getGroupName());
            groups.add(groupMap);
        }
        Organization organization = userBo.getOrganization();
        userInfo.put("userId", userBo.getId());
        userInfo.put("account", userBo.getAccount());
        userInfo.put("userName", userBo.getUserName());
        userInfo.put("expireTime", userBo.getExpireTime());
        userInfo.put("isAdmin", userBo.getIsAdmin());
        userInfo.put("organizationId", userBo.getOrganizationId());
        userInfo.put("organizationName", organization.getName());
        userInfo.put("locationLevel", organization.getLocationLevel());
        userInfo.put("groups", groups);
        Map<String, Object> map = new HashMap<>();
        map.put("userId", userBo.getId());
        userInfo.putAll(getMenus(map));
        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);
        } 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;
    }

    @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()));
        }

        Map<String, Object> resultMap = new LinkedHashMap<>();
        //第一级菜单
        List<Menu> oneMenu = allMenus.stream()
@@ -128,10 +165,8 @@

    //获取用户层级菜单递归方法
    private List<Map<String, Object>> getMenusByRecursion(Menu menu, List<Menu> menus) {
        List<List<Map<String, Object>>> resultList = new ArrayList();
        Menu newMenu = new Menu();
        newMenu.setParentId(menu.getId());

        //筛选出下一级菜单信息
        List<Menu> nextLevelMenus = menus.stream()
                .filter(o -> o.getParentId().equals(menu.getId()))
@@ -149,93 +184,191 @@
                menuMap.put("menus", getMenusByRecursion(o, menus));
                list.add(menuMap);
            });
            resultList.add(list);
        }
        return list;
    }

    @Override
    public Map<String, Object> addUser(User user, Integer userId) {
        Map<String, Object> resultMap = new HashMap<>();
        User currentUser = userMapper.selectById(userId);
        if (!currentUser.getIsAdmin()) {
            resultMap.put("flag", false);
            resultMap.put("msg", "添加失败，没有权限");
            return resultMap;
        }
    @Transactional
    public Map<String, Object> addUser(User user, String token) {
        Map<String, Object> result = new HashMap<>();
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);

        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("account", user.getAccount());
        userMapper.selectOne(queryWrapper);
        if (userMapper.selectOne(queryWrapper) == null) {
            user.setOrganizationId(currentUser.getOrganizationId());
            user.setExpireTime(currentUser.getExpireTime());
            userMapper.insert(user);
            resultMap.put("flag", true);
            resultMap.put("msg", "添加成功");
        } else {
            resultMap.put("flag", false);
            resultMap.put("msg", "添加失败，账户名已存在");
        queryWrapper.eq("account", user.getAccount()).eq("is_delete", Constants.NOT_DELETE);
        //校验账户是否存在
        if (user.selectOne(queryWrapper) != null) {
            result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode());
            result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
            return result;
        }
        return resultMap;
        //正则校验账户
        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())) {
            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);
        if (!RegexUtils.checkPassword(password)) {
            result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
            result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
            return result;
        }
        //正则校验手机号
        if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
            result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode());
            result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
            return result;
        }
        //密码加密
        user.setPassword(MD5Utils.saltMD5(password));
        user.setOrganizationId((int) currentUserInfo.get("organizationId"));
        user.setIsAdmin(false);
        //新增账户的过期时间
        Date userExpireTime = user.getExpireTime();
        //当前账户的过期时间
        Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
        if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
            user.setExpireTime(currentUserExpireTime);
        }
        userMapper.insert(user);
        return result;
    }

    @Override
    public Map<String, Object> deleteUser(Integer userId, Integer currentUserId) {
        Map<String, Object> resultMap = new HashMap<>();
        User currentUser = userMapper.selectById(currentUserId);
        if (!currentUser.getIsAdmin()) {
            resultMap.put("flag", false);
            resultMap.put("msg", "删除失败，没有权限");
        } else {
            User user = new User();
            user.setId(userId);
            user.setIsDelete("1");
            userMapper.updateById(user);
            resultMap.put("flag", true);
            resultMap.put("msg", "删除成功");
    @Transactional
    public void deleteUser(User user) {
        String userId = user.getId().toString();
        //逻辑删除user
        user.setIsDelete(Constants.DELETE);
        userMapper.updateById(user);
        //逻辑删除user_group
        UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>();
        deleteWrapper.set("is_delete", Constants.DELETE).eq("user_id", userId);
        //更新redis
        if (TokenUtils.hHasKey(userId)) {
            String token = TokenUtils.hget(userId).toString();
            TokenUtils.destoryToken(userId, token);
        }
        return resultMap;
        userGroupMapper.update(null, deleteWrapper);
    }

    @Override
    public Map<String, Object> updateUser(User user, Integer currentUserId) {
        Map<String, Object> resultMap = new HashMap<>();
        User currentUser = userMapper.selectById(currentUserId);
        if (!currentUser.getIsAdmin()) {
            resultMap.put("flag", false);
            resultMap.put("msg", "修改失败，没有权限");
            return resultMap;
        }
    @Transactional
    public Map<String, Object> updateUser(User user, String token) {
        Map<String, Object> result = new HashMap<>();
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("account", user.getAccount());
        if (userMapper.selectOne(queryWrapper) == null) {
            userMapper.updateById(user);
            resultMap.put("flag", true);
            resultMap.put("msg", "修改成功");
        queryWrapper.ne("id", user.getId())
                .eq("account", user.getAccount())
                .eq("is_delete", Constants.NOT_DELETE);
        //校验账户名是否重复
        if (userMapper.selectOne(queryWrapper) != null) {
            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())) {
            result.put("code", ResponseCodeEnum.EMAIL_INVALID.getCode());
            result.put("msg", ResponseCodeEnum.EMAIL_INVALID.getMsg());
            return result;
        }
        //正则校验密码
        String password = user.getPassword();
        if (password != null) {
            //密码解密
            //password = AESUtils.decrypt(password, AESKey);
            if (!RegexUtils.checkPassword(password)) {
                result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
                result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
                return result;
            }
        }
        //正则校验手机号
        if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
            result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode());
            result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
            return result;
        }
        //密码MD5加密
        user.setPassword(MD5Utils.saltMD5(password));
        user.setOrganizationId((int) currentUserInfo.get("organizationId"));
        user.setIsAdmin(false);
        //所修改账户的过期时间
        Date userExpireTime = user.getExpireTime();
        //当前账户的过期时间
        Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
        if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
            user.setExpireTime(currentUserExpireTime);
        }
        //更新redis
        String userId = user.getId().toString();
        if (TokenUtils.hHasKey(userId)) {
            String deleterToken = TokenUtils.hget(userId).toString();
            TokenUtils.destoryToken(userId, deleterToken);
        }
        userMapper.updateById(user);
        return result;
    }

    @Override
    public Page<User> selectUsers(Map<String, Object> parameters) {
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(parameters.get("token").toString());
        Object organizationId = currentUserInfo.get("organizationId");
        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("organization_id", organizationId)
                .eq("is_delete", Constants.NOT_DELETE);
        Object order = parameters.get("order");
        Object account = parameters.get("account");
        Object userName = parameters.get("userName");
        Object mobile = parameters.get("mobile");
        Object email = parameters.get("mobile");
        Object wechat = parameters.get("wechat");
        //模糊查询参数
        if (account != null) {
            queryWrapper.like("account", account);
        }
        if (userName != null) {
            queryWrapper.like("user_name", userName);
        }
        if (mobile != null) {
            queryWrapper.like("mobile", mobile);
        }
        if (email != null) {
            queryWrapper.like("email", email);
        }
        if (wechat != null) {
            queryWrapper.like("wechat", wechat);
        }

        int page = Integer.parseInt(parameters.get("page").toString());
        int size = Integer.parseInt(parameters.get("size").toString());
        Page<User> pageData = new Page<>(page, size);
        //排序参数,默认id升序
        if (order == null) {
            queryWrapper.orderByAsc("id");
        } else {
            resultMap.put("flag", false);
            resultMap.put("msg", "修改失败，账户已存在");
            queryWrapper.orderByAsc(order.toString(), "id");
        }
        return resultMap;
        Page<User> userPage = userMapper.selectPage(pageData, queryWrapper);
        pageData.setRecords(userPage.getRecords());
        return userPage;
    }

    @Override
    public List<User> getUsersByOrgId(Integer currentUserId) {
        User currentUser = userMapper.selectById(currentUserId);
        if (!currentUser.getIsAdmin()) {
            return null;
        }
        Map<String, Object> queryMap = new HashMap<>();
        queryMap.put("organizationId", currentUser.getOrganizationId());
        return userMapper.selectByMap(queryMap);
    }

    @Override
    public User getUserById(Integer userId, Integer currentUserId) {
        User currentUser = userMapper.selectById(currentUserId);
        if (!currentUser.getIsAdmin()) {
            return null;
        }
        return userMapper.selectById(userId);
    }
}