From 69aa1c97d28217b5612f329cd3310327189f36c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Thu, 4 Jan 2024 19:50:21 +0800 Subject: [PATCH] 123 --- .../cai/controller/admin/BlackController.java | 95 +++++++++++++++++++ .../main/java/com/ruoyi/cai/domain/Black.java | 51 ++++++++++ .../cai/manager/SystemConfigManager.java | 5 +- .../com/ruoyi/cai/mapper/BlackMapper.java | 14 +++ .../com/ruoyi/cai/service/BlackService.java | 14 +++ .../cai/service/impl/BlackServiceImpl.java | 17 ++++ .../main/resources/mapper/cai/BlackMapper.xml | 18 ++++ 7 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BlackController.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Black.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/BlackMapper.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/service/BlackService.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BlackServiceImpl.java create mode 100644 ruoyi-cai/src/main/resources/mapper/cai/BlackMapper.xml diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BlackController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BlackController.java new file mode 100644 index 00000000..187a01b5 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BlackController.java @@ -0,0 +1,95 @@ +package com.ruoyi.cai.controller.admin; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.cai.domain.Black; +import com.ruoyi.cai.service.BlackService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +/** + * 黑名单 + * + * @author 77 + * @date 2024-01-04 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/cai/black") +public class BlackController extends BaseController { + + private final BlackService iBlackService; + + /** + * 查询黑名单列表 + */ + @SaCheckPermission("cai:black:list") + @GetMapping("/list") + public TableDataInfo list(Black bo, PageQuery pageQuery) { + Page page = iBlackService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(Black::getCreateTime)); + return TableDataInfo.build(page); + } + + /** + * 获取黑名单详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("cai:black:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(iBlackService.getById(id)); + } + + /** + * 新增黑名单 + */ + @SaCheckPermission("cai:black:add") + @Log(title = "黑名单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody Black bo) { + return toAjax(iBlackService.save(bo)); + } + + /** + * 修改黑名单 + */ + @SaCheckPermission("cai:black:edit") + @Log(title = "黑名单", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody Black bo) { + return toAjax(iBlackService.updateById(bo)); + } + + /** + * 删除黑名单 + * + * @param ids 主键串 + */ + @SaCheckPermission("cai:black:remove") + @Log(title = "黑名单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(iBlackService.removeBatchByIds(Arrays.asList(ids))); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Black.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Black.java new file mode 100644 index 00000000..884d9ae0 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Black.java @@ -0,0 +1,51 @@ +package com.ruoyi.cai.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 黑名单对象 cai_black + * + * @author 77 + * @date 2024-01-04 + */ +@Data +@TableName("cai_black") +public class Black implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * ID + */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + /** + * ip地址 + */ + private String ipAddress; + /** + * 1-IP 2-MIC + */ + private Integer type; + /** + * 启用状态 1-启用 0-关闭 + */ + private Integer enableStatus; + /** + * 创建人 + */ + private Long createById; + /** + * 创建人名 + */ + private String createByName; + + private LocalDateTime createTime; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java index be8e63ec..e685f324 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java @@ -105,10 +105,13 @@ public class SystemConfigManager { public void setSystemConfig(SystemConfigEnum systemConfig,String value){ - redisTemplate.opsForHash().put(RedisConstant.SYSTEM_CONFIG, systemConfig.name(),value); + this.set(systemConfig.name(),value); } public void set(String key, String value) { + if(key.equals(SystemConfigEnum.SENSITIVE_ENABLE.getKey())){ + sensitiveService.setSensitive(value.equals("1")); + } redisTemplate.opsForHash().put(RedisConstant.SYSTEM_CONFIG, key,value); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/BlackMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/BlackMapper.java new file mode 100644 index 00000000..0c4fa775 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/BlackMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cai.domain.Black; + +/** + * 黑名单Mapper接口 + * + * @author 77 + * @date 2024-01-04 + */ +public interface BlackMapper extends BaseMapper { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/BlackService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/BlackService.java new file mode 100644 index 00000000..642daee4 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/BlackService.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cai.domain.Black; + +/** + * 黑名单Service接口 + * + * @author 77 + * @date 2024-01-04 + */ +public interface BlackService extends IService { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BlackServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BlackServiceImpl.java new file mode 100644 index 00000000..0b4628f8 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BlackServiceImpl.java @@ -0,0 +1,17 @@ +package com.ruoyi.cai.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.cai.domain.Black; +import com.ruoyi.cai.mapper.BlackMapper; +import com.ruoyi.cai.service.BlackService; +import org.springframework.stereotype.Service; + +/** + * 黑名单Service业务层处理 + * + * @author 77 + * @date 2024-01-04 + */ +@Service +public class BlackServiceImpl extends ServiceImpl implements BlackService { +} diff --git a/ruoyi-cai/src/main/resources/mapper/cai/BlackMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/BlackMapper.xml new file mode 100644 index 00000000..1073b9a8 --- /dev/null +++ b/ruoyi-cai/src/main/resources/mapper/cai/BlackMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + +