修复bug:冻结用户后用户未掉线

luodangjia

2025-02-06 4d73d01c66ad5f7887e62634cd22c286c5e8d3c6

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -12,11 +12,16 @@
import com.ruoyi.account.mapper.AppUserMapper;
import com.ruoyi.account.service.*;
import com.ruoyi.account.util.ObsUploadUtil;
import com.ruoyi.account.util.weChat.EnvVersion;
import com.ruoyi.account.util.weChat.WeChatUtil;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
@@ -30,7 +35,10 @@
import com.ruoyi.other.api.feignClient.VipSettingClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -94,6 +102,14 @@
    private BalanceChangeRecordService balanceChangeRecordService;
    @Resource
    private UserChangeLogService userChangeLogService;
    @Resource
    private RedisService redisService;

    @Resource
    private WeChatUtil weChatUtil;
    
    @Value("${file.upload.location}")
    private String filePath;


    @ResponseBody
@@ -213,6 +229,13 @@
    public R<AppUser> info() {
        Long userId = tokenService.getLoginUserApplet().getUserid();
        AppUser user = appUserService.getById(userId);
        if(StringUtils.isEmpty(user.getQrCode())){
            //获取微信推广二维码
            String fileName = UUID.randomUUID() + ".jpg";
            String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/login/login", "id=" + user.getId(), EnvVersion.RELEASE, filePath + fileName);
            user.setQrCode(getwxacodeunlimit);
            appUserService.updateById(user);
        }
        return R.ok(user);
    }

@@ -271,49 +294,87 @@
                .eq(AppUser::getDelFlag, 0)
                .ne(AppUser::getStatus, 3)
                .list();

        Long vip1Count1 =0L;
        Long vip1Count2 =0L;
        Long vip1Count3 =0L;
        Long vip1Count4 =0L;
        Long vip1Count5 =0L;
        Long vip1Count6 =0L;
        Long vip1Count7 =0L;
        for (AppUser appUser : list) {
            if (appUser.getVipId() == 1){
                vip1Count1++;
            }
            if (appUser.getVipId() == 2){
                vip1Count2++;
            }
            if (appUser.getVipId() == 3){
                vip1Count3++;
            }
            if (appUser.getVipId() == 4){
                vip1Count4++;
            }
            if (appUser.getVipId() == 5){
                vip1Count5++;
            }
            if (appUser.getVipId() == 6){
                vip1Count6++;
            }
            if (appUser.getVipId() == 7){
                vip1Count7++;
            }

            Long count1 = appUserService.lambdaQuery()
                    .eq(AppUser::getVipId, 1)
                    .eq(AppUser::getInviteUserId, appUser.getId())
                    .eq(AppUser::getDelFlag, 0)
                    .ne(AppUser::getStatus, 3)
                    .count();
            vip1Count1 += count1;

            Long count2 = appUserService.lambdaQuery()
                    .eq(AppUser::getVipId, 2)
                    .eq(AppUser::getInviteUserId, appUser.getId())
                    .eq(AppUser::getDelFlag, 0)
                    .ne(AppUser::getStatus, 3)
                    .count();
            vip1Count2 += count2;
            Long count3 = appUserService.lambdaQuery()
                    .eq(AppUser::getVipId, 3)
                    .eq(AppUser::getInviteUserId, appUser.getId())
                    .eq(AppUser::getDelFlag, 0)
                    .ne(AppUser::getStatus, 3)
                    .count();
            vip1Count3 += count3;
            Long count4 = appUserService.lambdaQuery()
                    .eq(AppUser::getVipId, 4)
                    .eq(AppUser::getInviteUserId, appUser.getId())
                    .eq(AppUser::getDelFlag, 0)
                    .ne(AppUser::getStatus, 3)
                    .count();
            vip1Count4 += count4;
            Long count5 = appUserService.lambdaQuery()
                    .eq(AppUser::getVipId, 5)
                    .eq(AppUser::getInviteUserId, appUser.getId())
                    .eq(AppUser::getDelFlag, 0)
                    .ne(AppUser::getStatus, 3)
                    .count();
            vip1Count5 += count5;
            Long count6 = appUserService.lambdaQuery()
                    .eq(AppUser::getVipId, 6)
                    .eq(AppUser::getInviteUserId, appUser.getId())
                    .eq(AppUser::getDelFlag, 0)
                    .ne(AppUser::getStatus, 3)
                    .count();
            vip1Count6 += count6;
            Long count7 = appUserService.lambdaQuery()
                    .eq(AppUser::getVipId, 7)
                    .eq(AppUser::getInviteUserId, appUser.getId())
                    .eq(AppUser::getDelFlag, 0)
                    .ne(AppUser::getStatus, 3)
                    .count();
            vip1Count7 += count7;
            appUser.setCount1(count1);
            appUser.setCount2(count2);
            appUser.setCount3(count3);
@@ -323,7 +384,13 @@
            appUser.setCount7(count7);
        }
        user.setBottomUsers(list);

        user.setCount1(vip1Count1);
        user.setCount2(vip1Count2);
        user.setCount3(vip1Count3);
        user.setCount4(vip1Count4);
        user.setCount5(vip1Count5);
        user.setCount6(vip1Count6);
        user.setCount7(vip1Count7);
        return R.ok(user);
    }

@@ -609,9 +676,23 @@
        AppUser byId = appUserService.getById(id);
        byId.setStatus(status);
        appUserService.updateById(byId);
        loginout(id);
        return R.ok();
    }

    private void loginout(Long userId) {
        Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
        if (!CollectionUtils.isEmpty(keys)) {
            for (String key : keys) {
                LoginUser user = redisService.getCacheObject(key);
                if (user.getUserid().equals(userId)) {
                    redisService.deleteObject(key);
                    break;
                }
            }
        }
    }

    @GetMapping("/select")
    @ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"})
    public R<AppUser> select(String phone) {