From 30dba589de5dda6811f0c6532834ebbc35ad2db7 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 10 Sep 2025 18:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=A2=9E=E5=8A=A0ip?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/SysIpWhitelistController.java | 36 ++++++++++++++-----
.../bonus/system/domain/SysIpWhitelist.java | 2 +-
.../system/mapper/SysIpWhitelistMapper.java | 2 +-
.../service/ISysIpWhitelistService.java | 2 +-
.../impl/SysIpWhitelistServiceImpl.java | 4 +--
.../mapper/system/SysIpWhitelistMapper.xml | 5 +--
6 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/system/SysIpWhitelistController.java b/bonus-admin/src/main/java/com/bonus/web/controller/system/SysIpWhitelistController.java
index 2d86819..5f5e701 100644
--- a/bonus-admin/src/main/java/com/bonus/web/controller/system/SysIpWhitelistController.java
+++ b/bonus-admin/src/main/java/com/bonus/web/controller/system/SysIpWhitelistController.java
@@ -81,9 +81,18 @@ public class SysIpWhitelistController extends BaseController {
@RequiresPermissions("system:whitelist:add")
@PostMapping("/add")
@SysLog(title = "新增白名单", businessType = OperaType.INSERT, logType = 1, module = "系统管理->新增白名单", details = "新增白名单")
- public R add(@RequestBody @Validated SysIpWhitelist sysIpWhitelist) {
- if (!StringUtils.isValidIp(sysIpWhitelist.getIpAddress())) {
- return R.fail("请输入正确的IP地址");
+ public R add(@RequestBody SysIpWhitelist sysIpWhitelist) {
+ if (sysIpWhitelist.getIpType().equals("single")) {
+ if (!StringUtils.isValidIp(sysIpWhitelist.getIpAddress())) {
+ return R.fail("请输入正确的IP地址");
+ }
+ } else if (sysIpWhitelist.getIpType().equals("range")) {
+ if (!StringUtils.isValidIp(sysIpWhitelist.getIpRangeStart())) {
+ return R.fail("请输入正确的IP网段起始地址");
+ }
+ if (!StringUtils.isValidIp(sysIpWhitelist.getIpRangeEnd())) {
+ return R.fail("请输入正确的IP网段结束地址");
+ }
}
return sysIpWhitelistService.insertSysIpWhitelist(sysIpWhitelist);
}
@@ -94,9 +103,18 @@ public class SysIpWhitelistController extends BaseController {
@RequiresPermissions("system:whitelist:edit")
@PostMapping("/edit")
@SysLog(title = "修改白名单", businessType = OperaType.UPDATE, logType = 1, module = "系统管理->修改白名单", details = "修改白名单")
- public R edit(@RequestBody @Validated SysIpWhitelist sysIpWhitelist) {
- if (!StringUtils.isValidIp(sysIpWhitelist.getIpAddress())) {
- return R.fail("请输入正确的IP地址");
+ public R edit(@RequestBody SysIpWhitelist sysIpWhitelist) {
+ if (sysIpWhitelist.getIpType().equals("single")) {
+ if (!StringUtils.isValidIp(sysIpWhitelist.getIpAddress())) {
+ return R.fail("请输入正确的IP地址");
+ }
+ } else if (sysIpWhitelist.getIpType().equals("range")) {
+ if (!StringUtils.isValidIp(sysIpWhitelist.getIpRangeStart())) {
+ return R.fail("请输入正确的IP网段起始地址");
+ }
+ if (!StringUtils.isValidIp(sysIpWhitelist.getIpRangeEnd())) {
+ return R.fail("请输入正确的IP网段结束地址");
+ }
}
return sysIpWhitelistService.updateSysIpWhitelist(sysIpWhitelist);
}
@@ -105,10 +123,10 @@ public class SysIpWhitelistController extends BaseController {
* 删除白名单管理
*/
@RequiresPermissions("system:whitelist:remove")
- @PostMapping("/{ids}")
+ @PostMapping("/del")
@SysLog(title = "删除白名单", businessType = OperaType.DELETE, logType = 1, module = "系统管理->删除白名单", details = "删除白名单")
- public R remove(@PathVariable Long[] ids) {
- return sysIpWhitelistService.deleteSysIpWhitelistByIds(ids);
+ public R remove(@RequestBody SysIpWhitelist sysIpWhitelist) {
+ return sysIpWhitelistService.deleteSysIpWhitelistByIds(sysIpWhitelist.getId().toString());
}
/**
diff --git a/bonus-system/src/main/java/com/bonus/system/domain/SysIpWhitelist.java b/bonus-system/src/main/java/com/bonus/system/domain/SysIpWhitelist.java
index c3c65b2..51b5aef 100644
--- a/bonus-system/src/main/java/com/bonus/system/domain/SysIpWhitelist.java
+++ b/bonus-system/src/main/java/com/bonus/system/domain/SysIpWhitelist.java
@@ -15,7 +15,6 @@ import java.util.Date;
public class SysIpWhitelist {
private Long id;
- @NotBlank(message = "IP地址不能为空")
private String ipAddress;
// 脱敏ip地址
private String ipAddressDes;
@@ -23,6 +22,7 @@ public class SysIpWhitelist {
private String ipRangeStartDes;
private String ipRangeEnd;
private String ipRangeEndDes;
+ private String ipType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date accessStartTime;
diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/SysIpWhitelistMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/SysIpWhitelistMapper.java
index 2538ca5..3bf958e 100644
--- a/bonus-system/src/main/java/com/bonus/system/mapper/SysIpWhitelistMapper.java
+++ b/bonus-system/src/main/java/com/bonus/system/mapper/SysIpWhitelistMapper.java
@@ -29,7 +29,7 @@ public interface SysIpWhitelistMapper {
int updateSysIpWhitelist(SysIpWhitelist sysIpWhitelist);
- int deleteSysIpWhitelistByIds(Long[] ids);
+ int deleteSysIpWhitelistByIds(@Param("id") String id);
int updateSysIpWhitelistStatus(SysIpWhitelist sysIpWhitelist);
}
diff --git a/bonus-system/src/main/java/com/bonus/system/service/ISysIpWhitelistService.java b/bonus-system/src/main/java/com/bonus/system/service/ISysIpWhitelistService.java
index e52224b..feb419f 100644
--- a/bonus-system/src/main/java/com/bonus/system/service/ISysIpWhitelistService.java
+++ b/bonus-system/src/main/java/com/bonus/system/service/ISysIpWhitelistService.java
@@ -27,7 +27,7 @@ public interface ISysIpWhitelistService {
R updateSysIpWhitelist(SysIpWhitelist sysIpWhitelist);
- R deleteSysIpWhitelistByIds(Long[] ids);
+ R deleteSysIpWhitelistByIds(String id);
R updateSysIpWhitelistStatus(SysIpWhitelist sysIpWhitelist);
}
diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/SysIpWhitelistServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/SysIpWhitelistServiceImpl.java
index 5cc04ce..8a60334 100644
--- a/bonus-system/src/main/java/com/bonus/system/service/impl/SysIpWhitelistServiceImpl.java
+++ b/bonus-system/src/main/java/com/bonus/system/service/impl/SysIpWhitelistServiceImpl.java
@@ -89,9 +89,9 @@ public class SysIpWhitelistServiceImpl implements ISysIpWhitelistService {
}
@Override
- public R deleteSysIpWhitelistByIds(Long[] ids) {
+ public R deleteSysIpWhitelistByIds(String id) {
try {
- int rows = whitelistMapper.deleteSysIpWhitelistByIds(ids);
+ int rows = whitelistMapper.deleteSysIpWhitelistByIds(id);
return rows > 0 ? R.ok() : R.fail();
} catch (Exception e) {
return R.fail();
diff --git a/bonus-system/src/main/resources/mapper/system/SysIpWhitelistMapper.xml b/bonus-system/src/main/resources/mapper/system/SysIpWhitelistMapper.xml
index f44c888..d74c12c 100644
--- a/bonus-system/src/main/resources/mapper/system/SysIpWhitelistMapper.xml
+++ b/bonus-system/src/main/resources/mapper/system/SysIpWhitelistMapper.xml
@@ -47,10 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
- delete from da_ky_sys_ip_whitelist where id in
-
- #{id}
-
+ delete from da_ky_sys_ip_whitelist where id = #{id}