From c6d888b7273ecf8469a8c6915e3fa9b36cd0afad Mon Sep 17 00:00:00 2001
From: duteliang <383200134@qq.com>
Date: Thu, 1 Feb 2024 00:55:22 +0800
Subject: [PATCH] init

---
 .../com/ruoyi/cai/enums/forbid/ForbidTimeEnum.java    |  1 +
 .../com/ruoyi/cai/enums/forbid/ForbidTypeEnum.java    |  4 +++-
 .../java/com/ruoyi/cai/manager/UserForbidManager.java | 11 ++++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/forbid/ForbidTimeEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/forbid/ForbidTimeEnum.java
index ea061ba0..9d0ac81d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/forbid/ForbidTimeEnum.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/forbid/ForbidTimeEnum.java
@@ -9,6 +9,7 @@ import lombok.Getter;
  */
 @Getter
 public enum ForbidTimeEnum {
+    UNFORBID(0,"解封"),
     HOUSE_6(1,"封6小时"),
     DAY_1(2,"封1天"),
     DAY_3(3,"封3天"),
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/forbid/ForbidTypeEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/forbid/ForbidTypeEnum.java
index 91fe8b43..831476ee 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/forbid/ForbidTypeEnum.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/forbid/ForbidTypeEnum.java
@@ -5,8 +5,10 @@ import lombok.Getter;
 @Getter
 public enum ForbidTypeEnum {
     USER(1,"封用户"),
+    @Deprecated
     UUID(2,"封设备"),
-    IMEI(3,"封IMEI"),
+    IMEI(3,"封IMEI"), // 安卓设备ID
+    @Deprecated
     MAC(4,"封MAC"),
     IP(5,"封IP"),
     ;
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java
index e88873e1..30b23e08 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java
@@ -14,6 +14,7 @@ import com.ruoyi.cai.mq.CommonDelayTypeEnum;
 import com.ruoyi.cai.mq.dto.CommonDelayDto;
 import com.ruoyi.cai.service.*;
 import com.ruoyi.cai.util.CaiDateUtil;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -47,15 +48,19 @@ public class UserForbidManager {
     public void batchForbid(UserForbidReq userForbidReq){
         List<Integer> type = userForbidReq.getType();
         User user = userService.getById(userForbidReq.getUserId());
+        ForbidTimeEnum forbidTimeEnum = ForbidTimeEnum.getByCode(userForbidReq.getForbidTime());
+        if(forbidTimeEnum == null){
+            throw new ServiceException("封禁天数错误");
+        }
         for (Integer integer : type) {
-            if(integer == 1){ // 封用户
+            if(ForbidTypeEnum.USER.getCode().equals(integer)){ // 封用户
                 UserForbidDTO dto = new UserForbidDTO();
                 dto.setForbidTime(userForbidReq.getForbidTime());
                 dto.setForbidType(ForbidTypeEnum.USER.getCode());
                 dto.setMember(user.getUsercode());
                 dto.setRemark(userForbidReq.getReason());
                 this.forbid(dto);
-            }else if(integer == 2){ // 封设备
+            }else if(ForbidTypeEnum.IMEI.getCode().equals(integer)){ // 封设备
                 UserInfo userInfo = userInfoService.getByUserId(user.getId());
                 if(userInfo != null && StringUtils.isNotEmpty(userInfo.getImei())){
                     UserForbidDTO dto = new UserForbidDTO();
@@ -65,7 +70,7 @@ public class UserForbidManager {
                     dto.setRemark(userForbidReq.getReason());
                     this.forbid(dto);
                 }
-            }else if(integer == 3){ // 封IP
+            }else if(ForbidTypeEnum.IP.getCode().equals(integer)){ // 封IP
                 UserInfo userInfo = userInfoService.getByUserId(user.getId());
                 if(userInfo != null && StringUtils.isNotEmpty(userInfo.getLastLoginIp())){
                     UserForbidDTO dto = new UserForbidDTO();