From e300d04502056be783b4157f46f4347ad1850453 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Thu, 10 Apr 2025 18:26:28 +0800 Subject: [PATCH] =?UTF-8?q?update:=E8=B0=83=E6=95=B4=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E9=9F=B3=E8=89=B2=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E9=80=82=E5=BA=94=E5=89=8D=E7=AB=AF=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=20(#732)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaozhi/modules/sys/controller/SysParamsController.java | 5 ++--- .../src/main/java/xiaozhi/modules/sys/dao/SysParamsDao.java | 2 +- .../java/xiaozhi/modules/sys/service/SysParamsService.java | 2 +- .../modules/sys/service/impl/SysParamsServiceImpl.java | 6 ++++-- .../xiaozhi/modules/timbre/controller/TimbreController.java | 3 +-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysParamsController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysParamsController.java index 252f5602..c8f95528 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysParamsController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysParamsController.java @@ -3,7 +3,6 @@ package xiaozhi.modules.sys.controller; import java.util.Map; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -95,11 +94,11 @@ public class SysParamsController { return new Result(); } - @DeleteMapping + @PostMapping("/delete") @Operation(summary = "删除") @LogOperation("删除") @RequiresPermissions("sys:role:superAdmin") - public Result delete(@RequestBody Long[] ids) { + public Result delete(@RequestBody String[] ids) { // 效验数据 AssertUtils.isArrayEmpty(ids, "id"); diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysParamsDao.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysParamsDao.java index d35d1445..6eebc8be 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysParamsDao.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysParamsDao.java @@ -27,7 +27,7 @@ public interface SysParamsDao extends BaseDao { * @param ids ids * @return 返回参数编码列表 */ - List getParamCodeList(Long[] ids); + List getParamCodeList(String[] ids); /** * 根据参数编码,更新value diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysParamsService.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysParamsService.java index e7a33a33..ac67a276 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysParamsService.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysParamsService.java @@ -23,7 +23,7 @@ public interface SysParamsService extends BaseService { void update(SysParamsDTO dto); - void delete(Long[] ids); + void delete(String[] ids); /** * 根据参数编码,获取参数的value值 diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysParamsServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysParamsServiceImpl.java index 3c7d596f..85814975 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysParamsServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysParamsServiceImpl.java @@ -132,11 +132,13 @@ public class SysParamsServiceImpl extends BaseServiceImpl paramCodeList = baseDao.getParamCodeList(ids); String[] paramCodes = paramCodeList.toArray(new String[paramCodeList.size()]); - sysParamsRedis.delete(paramCodes); + if (paramCodes.length > 0) { + sysParamsRedis.delete(paramCodes); + } // 删除 deleteBatchIds(Arrays.asList(ids)); diff --git a/main/manager-api/src/main/java/xiaozhi/modules/timbre/controller/TimbreController.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/controller/TimbreController.java index 15ddf8fc..ff420c02 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/timbre/controller/TimbreController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/controller/TimbreController.java @@ -3,7 +3,6 @@ package xiaozhi.modules.timbre.controller; import java.util.Map; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -82,7 +81,7 @@ public class TimbreController { return new Result<>(); } - @DeleteMapping + @PostMapping("/delete") @Operation(summary = "音色删除") @RequiresPermissions("sys:role:superAdmin") public Result delete(@RequestBody String[] ids) {