init

ruoyi-cai/src/main/java/com/ruoyi/cai/service/BlackService.java

@@ -11,4 +11,13 @@ import com.ruoyi.cai.domain.Black;
  */
 public interface BlackService extends IService<Black> {
 
+    boolean addBlack(Black black);
+
+    boolean updateBlackStatus(Long id, Integer enableStatus);
+
+    boolean deleteBlack(Long id);
+
+    boolean checkBlackIp(String ip);
+
+    boolean checkBlackMic(String ip);
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInfoService.java

@@ -1,9 +1,14 @@
 package com.ruoyi.cai.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.cai.domain.UserInfo;
+import com.ruoyi.cai.dto.admin.vo.UserInfoAdminVo;
+import com.ruoyi.common.core.domain.PageQuery;
 
 public interface UserInfoService extends IService<UserInfo> {
 
     UserInfo getByUserId(Long userId);
+
+    Page<UserInfoAdminVo> pageAdmin(PageQuery pageQuery, UserInfoAdminVo bo);
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BlackServiceImpl.java

@@ -1,9 +1,16 @@
 package com.ruoyi.cai.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cai.constant.RedisConstant;
 import com.ruoyi.cai.domain.Black;
 import com.ruoyi.cai.mapper.BlackMapper;
 import com.ruoyi.cai.service.BlackService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.helper.LoginHelper;
+import org.apache.commons.lang3.BooleanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,4 +21,60 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BlackServiceImpl extends ServiceImpl<BlackMapper,Black> implements BlackService {
+
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    private String getKey(Integer type){
+        return String.format(RedisConstant.BLACK_REDIS,type);
+    }
+
+    @Override
+    public boolean addBlack(Black black){
+        black.setCreateById(LoginHelper.getUserId());
+        black.setCreateByName(LoginHelper.getUsername());
+        this.save(black);
+        redisTemplate.opsForSet().add(getKey(black.getType()),black.getIpAddress());
+        return true;
+    }
+
+    @Override
+    public boolean updateBlackStatus(Long id,Integer enableStatus){
+        Black black = this.getById(id);
+        if(black == null){
+            throw new ServiceException("数据不存在");
+        }
+        this.update(Wrappers.lambdaUpdate(Black.class).set(Black::getEnableStatus,enableStatus).eq(Black::getId,id));
+        if(enableStatus == 1){
+            redisTemplate.opsForSet().add(getKey(black.getType()),black.getIpAddress());
+        }else {
+            redisTemplate.opsForSet().remove(getKey(black.getType()),black.getIpAddress());
+        }
+        return true;
+    }
+
+    @Override
+    public boolean deleteBlack(Long id){
+        Black black = this.getById(id);
+        if(black == null){
+            throw new ServiceException("数据不存在");
+        }
+        this.removeById(id);
+        redisTemplate.opsForSet().remove(getKey(black.getType()),black.getIpAddress());
+        return true;
+    }
+
+    @Override
+    public boolean checkBlackIp(String ip){
+        Boolean member = redisTemplate.opsForSet().isMember(getKey(1), ip);
+        return BooleanUtils.isTrue(member);
+    }
+
+    @Override
+    public boolean checkBlackMic(String ip){
+        Boolean member = redisTemplate.opsForSet().isMember(getKey(2), ip);
+        return BooleanUtils.isTrue(member);
+    }
+
+
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CitysServiceImpl.java

@@ -30,7 +30,7 @@ public class CitysServiceImpl extends ServiceImpl<CitysMapper, Citys> implements
     @Autowired
     private StringRedisTemplate redisTemplate;
 
-    @PostConstruct
+//    @PostConstruct
     public void init() {
         this.resetRedis();
     }

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInfoServiceImpl.java

@@ -1,10 +1,13 @@
 package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.UserInfo;
+import com.ruoyi.cai.dto.admin.vo.UserInfoAdminVo;
 import com.ruoyi.cai.mapper.UserInfoMapper;
 import com.ruoyi.cai.service.UserInfoService;
+import com.ruoyi.common.core.domain.PageQuery;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -15,4 +18,9 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         return this.getOne(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUserId,userId)
                 .last("limit 1"));
     }
+
+    @Override
+    public Page<UserInfoAdminVo> pageAdmin(PageQuery pageQuery, UserInfoAdminVo bo) {
+        return baseMapper.pageAdmin(pageQuery.build(),bo);
+    }
 }