This commit is contained in:
duteliang
2024-02-01 00:50:42 +08:00
parent 43be20b11f
commit 574ef6cfdb
6 changed files with 51 additions and 13 deletions

View File

@@ -21,6 +21,7 @@ import com.ruoyi.cai.service.UserInfoService;
import com.ruoyi.cai.service.UserService;
import com.ruoyi.cai.util.CaiDateUtil;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -118,12 +119,23 @@ public class UserForbidServiceImpl extends ServiceImpl<UserForbidMapper, UserFor
userForbidInfo.setUserForbid(userForbid);
userForbidInfo.setUserForbidBetween(CaiDateUtil.betweenShowString(LocalDateTime.now(),userForbid.getEndTime()));
}
UserForbid ipUserForbid = this.getOne(Wrappers.lambdaQuery(UserForbid.class)
.eq(UserForbid::getMember, userInfo.getLastLoginIp())
.eq(UserForbid::getType, ForbidTypeEnum.IP.getCode()).last("limit 1"));
if(ipUserForbid != null && ForbidStatusEnum.FORBID.getCode().equals(ipUserForbid.getForbidStatus()) && ipUserForbid.getEndTime().isAfter(LocalDateTime.now())){
userForbidInfo.setIpUserForbid(ipUserForbid);
userForbidInfo.setIpForbidBetween(CaiDateUtil.betweenShowString(LocalDateTime.now(),ipUserForbid.getEndTime()));
if(StringUtils.isNotBlank(userInfo.getLastLoginIp())){
UserForbid ipUserForbid = this.getOne(Wrappers.lambdaQuery(UserForbid.class)
.eq(UserForbid::getMember, userInfo.getLastLoginIp())
.eq(UserForbid::getType, ForbidTypeEnum.IP.getCode()).last("limit 1"));
if(ipUserForbid != null && ForbidStatusEnum.FORBID.getCode().equals(ipUserForbid.getForbidStatus()) && ipUserForbid.getEndTime().isAfter(LocalDateTime.now())){
userForbidInfo.setIpUserForbid(ipUserForbid);
userForbidInfo.setIpForbidBetween(CaiDateUtil.betweenShowString(LocalDateTime.now(),ipUserForbid.getEndTime()));
}
}
if(StringUtils.isNotBlank(userInfo.getImei())){
UserForbid imeiUserForbid = this.getOne(Wrappers.lambdaQuery(UserForbid.class)
.eq(UserForbid::getMember, userInfo.getImei())
.eq(UserForbid::getType, ForbidTypeEnum.IMEI.getCode()).last("limit 1"));
if(imeiUserForbid != null && ForbidStatusEnum.FORBID.getCode().equals(imeiUserForbid.getForbidStatus()) && imeiUserForbid.getEndTime().isAfter(LocalDateTime.now())){
userForbidInfo.setImeiUserForbid(imeiUserForbid);
userForbidInfo.setImeiForbidBetween(CaiDateUtil.betweenShowString(LocalDateTime.now(),imeiUserForbid.getEndTime()));
}
}
return userForbidInfo;
}