20220606

xiaoyong931011

2022-07-08 bd4ab82f2e0c485f36a254e3cbf72f21dabfd628

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.contants.AppContants;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.*;
import com.xcong.farmer.cms.modules.system.entity.*;
@@ -13,7 +14,9 @@
import com.xcong.farmer.cms.modules.system.service.IUserService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.*;
import com.xcong.farmer.cms.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -43,6 +46,8 @@
    private MessageBoardMapper messageBoardMapper;
    @Resource
    private MenuMapper menuMapper;
    @Resource
    private RedisUtils redisUtils;

    @Override
    public Result getUserInPage(AdminUserDto adminUserDto) {
@@ -52,9 +57,9 @@
        long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
        if(companyId > UserEntity.USER_BELONG_TOP){
            userEntity.setCompanyId(companyId);
            userEntity.setRoleName(RoleEntity.ROLE_ADMIN_NAME);
            userEntity.setRoleId(RoleEntity.ROLE_ADMIN_NAME_ID);
        }else if(companyId == UserEntity.USER_BELONG_TOP){
            userEntity.setRoleName(RoleEntity.ROLE_SUPER_NAME);
            userEntity.setRoleId(RoleEntity.ROLE_SUPER_NAME_ID);
        }
        if(StrUtil.isNotEmpty(adminUserDto.getUsername())){
            userEntity.setUsername(adminUserDto.getUsername());
@@ -350,6 +355,11 @@
                userRoleMapper.delete(objectQueryWrapper);

                this.baseMapper.deleteById(userId);

                String redisMember = AppContants.APP_LOGIN_PREFIX + userId;
                String token = redisUtils.getString(redisMember);
                redisUtils.del(AppContants.APP_LOGIN_PREFIX + token);
                SecurityContextHolder.clearContext();
            }

        }
@@ -401,8 +411,22 @@

    @Override
    public Result viewHomePage() {
        UserEntity loginUser = LoginUserUtil.getLoginUser();
        Long companyId = LoginUserUtil.getCompanyId();

        AdminHomePageInfoVo adminHomePageInfoVo = new AdminHomePageInfoVo();

        QueryWrapper<UserRoleEntity> userRoleQueryWrapper = new QueryWrapper<>();
        userRoleQueryWrapper.eq("user_id",loginUser.getId());
        List<UserRoleEntity> userRoleEntities = userRoleMapper.selectList(userRoleQueryWrapper);
        if(CollUtil.isNotEmpty(userRoleEntities)){
            List<String> roleNames = new ArrayList<>();
            for(UserRoleEntity userRoleEntity : userRoleEntities){
                RoleEntity roleEntity = roleMapper.selectById(userRoleEntity.getRoleId());
                roleNames.add(roleEntity.getRoleName());
            }
            adminHomePageInfoVo.setRoleNames(roleNames);
        }

        QueryWrapper<ColumnEntity> columnQueryWrapper = new QueryWrapper<>();
        columnQueryWrapper.eq("company_id",companyId);
@@ -410,6 +434,7 @@

        QueryWrapper<ArticleEntity> articleQueryWrapper = new QueryWrapper<>();
        articleQueryWrapper.eq("company_id",companyId);
        articleQueryWrapper.eq("del_status",ArticleEntity.DELETE_STATUS_NO);
        adminHomePageInfoVo.setArticleNum(articleMapper.selectCount(articleQueryWrapper));

        QueryWrapper<MessageBoardEntity> messageQueryWrapper = new QueryWrapper<>();