shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-01-31 22:36:50 +08:00
parent 98458c32fa
commit b725191b1a
11 changed files with 101 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ForbidCache.java
View File

@@ -2,7 +2,7 @@ package com.ruoyi.cai.manager;
import com.ruoyi.cai.constant.RedisHttpConstant;
import com.ruoyi.cai.domain.UserForbid;
import com.ruoyi.cai.enums.ForbidTypeEnum;
import com.ruoyi.cai.enums.forbid.ForbidTypeEnum;
import com.ruoyi.common.utils.MapGetUtil;
import org.redisson.api.RMap;
import org.redisson.api.RedissonClient;

14
ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java
View File

@@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.*;
import com.ruoyi.cai.dto.admin.UserForbidDTO;
import com.ruoyi.cai.dto.admin.query.UserForbidReq;
import com.ruoyi.cai.enums.ForbidTimeEnum;
import com.ruoyi.cai.enums.ForbidTypeEnum;
import com.ruoyi.cai.enums.ForbidStatusEnum;
import com.ruoyi.cai.enums.forbid.ForbidTimeEnum;
import com.ruoyi.cai.enums.forbid.ForbidTypeEnum;
import com.ruoyi.cai.mq.AmqpProducer;
import com.ruoyi.cai.mq.CommonDelayTypeEnum;
import com.ruoyi.cai.mq.dto.CommonDelayDto;
@@ -22,7 +23,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
@@ -155,7 +155,7 @@ public class UserForbidManager {
UserForbid userForbid = userForbidService.getById(id);
userForbidService.update(Wrappers.lambdaUpdate(UserForbid.class)
.eq(UserForbid::getId,userForbid.getId())
.set(UserForbid::getForbidStatus,2));
.set(UserForbid::getForbidStatus, ForbidStatusEnum.NORMAL.getCode()));
if(ForbidTypeEnum.USER.getCode().equals(userForbid.getType())){
User user = userService.getByUserCode(userForbid.getMember());
userService.update(Wrappers.lambdaUpdate(User.class).eq(User::getId,user.getId()).set(User::getStatus,0));
@@ -178,7 +178,7 @@ public class UserForbidManager {
current++;
page.setCurrent(current);
Page<UserForbid> res = userForbidService.page(page,Wrappers.lambdaQuery(UserForbid.class)
.eq(UserForbid::getForbidStatus,1));
.eq(UserForbid::getForbidStatus,ForbidStatusEnum.FORBID.getCode()));
List<UserForbid> records = res.getRecords();
if(records.isEmpty()){
break;
@@ -196,7 +196,7 @@ public class UserForbidManager {
}
for (Long expireId : expireConsumer) {
UserForbid userForbid = userForbidService.getById(expireId);
if(userForbid == null || userForbid.getForbidStatus() == 2){
if(userForbid == null || ForbidStatusEnum.NORMAL.getCode().equals(userForbid.getForbidStatus())){
return;
}
// < 12小时
@@ -215,7 +215,7 @@ public class UserForbidManager {
public void checkExpire(Long id){
UserForbid userForbid = userForbidService.getById(id);
if(userForbid == null || userForbid.getForbidStatus() == 2){
if(userForbid == null || ForbidStatusEnum.NORMAL.getCode().equals(userForbid.getForbidStatus())){
return;
}
if(!userForbid.getEndTime().isAfter(LocalDateTime.now())){