This commit is contained in:
duteliang
2024-02-01 00:55:22 +08:00
parent 574ef6cfdb
commit c6d888b727
3 changed files with 12 additions and 4 deletions

View File

@@ -9,6 +9,7 @@ import lombok.Getter;
*/ */
@Getter @Getter
public enum ForbidTimeEnum { public enum ForbidTimeEnum {
UNFORBID(0,"解封"),
HOUSE_6(1,"封6小时"), HOUSE_6(1,"封6小时"),
DAY_1(2,"封1天"), DAY_1(2,"封1天"),
DAY_3(3,"封3天"), DAY_3(3,"封3天"),

View File

@@ -5,8 +5,10 @@ import lombok.Getter;
@Getter @Getter
public enum ForbidTypeEnum { public enum ForbidTypeEnum {
USER(1,"封用户"), USER(1,"封用户"),
@Deprecated
UUID(2,"封设备"), UUID(2,"封设备"),
IMEI(3,"封IMEI"), IMEI(3,"封IMEI"), // 安卓设备ID
@Deprecated
MAC(4,"封MAC"), MAC(4,"封MAC"),
IP(5,"封IP"), IP(5,"封IP"),
; ;

View File

@@ -14,6 +14,7 @@ import com.ruoyi.cai.mq.CommonDelayTypeEnum;
import com.ruoyi.cai.mq.dto.CommonDelayDto; import com.ruoyi.cai.mq.dto.CommonDelayDto;
import com.ruoyi.cai.service.*; import com.ruoyi.cai.service.*;
import com.ruoyi.cai.util.CaiDateUtil; import com.ruoyi.cai.util.CaiDateUtil;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -47,15 +48,19 @@ public class UserForbidManager {
public void batchForbid(UserForbidReq userForbidReq){ public void batchForbid(UserForbidReq userForbidReq){
List<Integer> type = userForbidReq.getType(); List<Integer> type = userForbidReq.getType();
User user = userService.getById(userForbidReq.getUserId()); User user = userService.getById(userForbidReq.getUserId());
ForbidTimeEnum forbidTimeEnum = ForbidTimeEnum.getByCode(userForbidReq.getForbidTime());
if(forbidTimeEnum == null){
throw new ServiceException("封禁天数错误");
}
for (Integer integer : type) { for (Integer integer : type) {
if(integer == 1){ // 封用户 if(ForbidTypeEnum.USER.getCode().equals(integer)){ // 封用户
UserForbidDTO dto = new UserForbidDTO(); UserForbidDTO dto = new UserForbidDTO();
dto.setForbidTime(userForbidReq.getForbidTime()); dto.setForbidTime(userForbidReq.getForbidTime());
dto.setForbidType(ForbidTypeEnum.USER.getCode()); dto.setForbidType(ForbidTypeEnum.USER.getCode());
dto.setMember(user.getUsercode()); dto.setMember(user.getUsercode());
dto.setRemark(userForbidReq.getReason()); dto.setRemark(userForbidReq.getReason());
this.forbid(dto); this.forbid(dto);
}else if(integer == 2){ // 封设备 }else if(ForbidTypeEnum.IMEI.getCode().equals(integer)){ // 封设备
UserInfo userInfo = userInfoService.getByUserId(user.getId()); UserInfo userInfo = userInfoService.getByUserId(user.getId());
if(userInfo != null && StringUtils.isNotEmpty(userInfo.getImei())){ if(userInfo != null && StringUtils.isNotEmpty(userInfo.getImei())){
UserForbidDTO dto = new UserForbidDTO(); UserForbidDTO dto = new UserForbidDTO();
@@ -65,7 +70,7 @@ public class UserForbidManager {
dto.setRemark(userForbidReq.getReason()); dto.setRemark(userForbidReq.getReason());
this.forbid(dto); this.forbid(dto);
} }
}else if(integer == 3){ // 封IP }else if(ForbidTypeEnum.IP.getCode().equals(integer)){ // 封IP
UserInfo userInfo = userInfoService.getByUserId(user.getId()); UserInfo userInfo = userInfoService.getByUserId(user.getId());
if(userInfo != null && StringUtils.isNotEmpty(userInfo.getLastLoginIp())){ if(userInfo != null && StringUtils.isNotEmpty(userInfo.getLastLoginIp())){
UserForbidDTO dto = new UserForbidDTO(); UserForbidDTO dto = new UserForbidDTO();