From ec6ab983f7d9b8e64b8add2d1e5e99eac49a60b3 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Fri, 21 Mar 2025 21:44:40 +0800 Subject: [PATCH] =?UTF-8?q?udate:=E8=A7=84=E8=8C=83=E5=8C=85=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E5=B0=8F=E5=86=99=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/security/oauth2/Oauth2Realm.java | 3 +- .../security/service/ShiroService.java | 8 ---- .../service/impl/ShiroServiceImpl.java | 16 ------- .../controller/TimbreController.java | 45 ++++++++++++++----- .../{Timbre => timbre}/dao/TimbreDao.java | 4 +- .../{Timbre => timbre}/dto/TimbreDataDTO.java | 2 +- .../{Timbre => timbre}/dto/TimbrePageDTO.java | 2 +- .../entity/TimbreEntity.java | 2 +- .../service/TimbreService.java | 10 ++--- .../service/impl/TimbreServiceImpl.java | 14 +++--- .../vo/TimbreDetailsVO.java | 2 +- 11 files changed, 53 insertions(+), 55 deletions(-) rename main/manager-api/src/main/java/xiaozhi/modules/{Timbre => timbre}/controller/TimbreController.java (51%) rename main/manager-api/src/main/java/xiaozhi/modules/{Timbre => timbre}/dao/TimbreDao.java (73%) rename main/manager-api/src/main/java/xiaozhi/modules/{Timbre => timbre}/dto/TimbreDataDTO.java (97%) rename main/manager-api/src/main/java/xiaozhi/modules/{Timbre => timbre}/dto/TimbrePageDTO.java (94%) rename main/manager-api/src/main/java/xiaozhi/modules/{Timbre => timbre}/entity/TimbreEntity.java (96%) rename main/manager-api/src/main/java/xiaozhi/modules/{Timbre => timbre}/service/TimbreService.java (80%) rename main/manager-api/src/main/java/xiaozhi/modules/{Timbre => timbre}/service/impl/TimbreServiceImpl.java (88%) rename main/manager-api/src/main/java/xiaozhi/modules/{Timbre => timbre}/vo/TimbreDetailsVO.java (95%) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Realm.java b/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Realm.java index b7d6c278..6b04bb08 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Realm.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/security/oauth2/Oauth2Realm.java @@ -19,6 +19,7 @@ import xiaozhi.modules.security.service.ShiroService; import xiaozhi.modules.sys.entity.SysUserEntity; import xiaozhi.modules.sys.enums.SuperAdminEnum; +import java.util.HashSet; import java.util.Set; /** @@ -47,7 +48,7 @@ public class Oauth2Realm extends AuthorizingRealm { UserDetail user = (UserDetail) principals.getPrimaryPrincipal(); //用户权限列表 - Set permsSet = shiroService.getUserPermissions(user); + Set permsSet = new HashSet<>(); if (user.getSuperAdmin() == SuperAdminEnum.YES.value()) { permsSet.add("sys:role:superAdmin"); diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/service/ShiroService.java b/main/manager-api/src/main/java/xiaozhi/modules/security/service/ShiroService.java index 980645d6..b9d18889 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/security/service/ShiroService.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/security/service/ShiroService.java @@ -1,22 +1,14 @@ package xiaozhi.modules.security.service; -import xiaozhi.common.user.UserDetail; import xiaozhi.modules.security.entity.SysUserTokenEntity; import xiaozhi.modules.sys.entity.SysUserEntity; -import java.util.List; -import java.util.Set; - /** * shiro相关接口 * Copyright (c) 人人开源 All rights reserved. * Website: https://www.renren.io */ public interface ShiroService { - /** - * 获取用户权限列表 - */ - Set getUserPermissions(UserDetail user); SysUserTokenEntity getByToken(String token); diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/ShiroServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/ShiroServiceImpl.java index 128d9b9d..97d16eaa 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/ShiroServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/ShiroServiceImpl.java @@ -19,22 +19,6 @@ public class ShiroServiceImpl implements ShiroService { private final SysUserDao sysUserDao; private final SysUserTokenDao sysUserTokenDao; - @Override - public Set getUserPermissions(UserDetail user) { - //系统管理员，拥有最高权限 - // TODO: 暂时写死，后续改成从数据库查询 - List permissionsList = new ArrayList<>(); - //用户权限列表 - Set permsSet = new HashSet<>(); - for (String permissions : permissionsList) { - if (StringUtils.isBlank(permissions)) { - continue; - } - permsSet.addAll(Arrays.asList(permissions.trim().split(","))); - } - - return permsSet; - } @Override public SysUserTokenEntity getByToken(String token) { 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 similarity index 51% rename from main/manager-api/src/main/java/xiaozhi/modules/Timbre/controller/TimbreController.java rename to main/manager-api/src/main/java/xiaozhi/modules/timbre/controller/TimbreController.java index bba48abf..dc6ccca7 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 @@ -1,20 +1,26 @@ -package xiaozhi.modules.Timbre.controller; +package xiaozhi.modules.timbre.controller; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; +import xiaozhi.common.constant.Constant; import xiaozhi.common.page.PageData; import xiaozhi.common.utils.Result; import xiaozhi.common.validator.ValidatorUtils; -import xiaozhi.modules.Timbre.dto.TimbreDataDTO; -import xiaozhi.modules.Timbre.dto.TimbrePageDTO; -import xiaozhi.modules.Timbre.service.TimbreService; -import xiaozhi.modules.Timbre.vo.TimbreDetailsVO; +import xiaozhi.modules.timbre.dto.TimbreDataDTO; +import xiaozhi.modules.timbre.dto.TimbrePageDTO; +import xiaozhi.modules.timbre.service.TimbreService; +import xiaozhi.modules.timbre.vo.TimbreDetailsVO; + +import java.util.Map; /** * 音色控制层 + * * @author zjy * @since 2025-3-21 */ @@ -27,38 +33,53 @@ public class TimbreController { @GetMapping @Operation(summary = "分页查找") - @RequiresPermissions("sys:ttsVoice:select") - public Result> page(@ModelAttribute TimbrePageDTO dto) { + @RequiresPermissions("sys:role:superAdmin") + @Parameters({ + @Parameter(name = "ttsModelId", description = "对应 TTS 模型主键", required = true), + @Parameter(name = "name", description = "音色名称"), + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), + }) + public Result> page( + @Parameter(hidden = true) @RequestParam Map params) { + TimbrePageDTO dto = new TimbrePageDTO(); + dto.setTtsModelId((String) params.get("ttsModelId")); + dto.setName((String) params.get("name")); + dto.setLimit((String) params.get(Constant.LIMIT)); + dto.setPage((String) params.get(Constant.PAGE)); + ValidatorUtils.validateEntity(dto); PageData page = timbreService.page(dto); return new Result>().ok(page); } + @PostMapping @Operation(summary = "音色保存") - @RequiresPermissions("sys:ttsVoice:save") + @RequiresPermissions("sys:role:superAdmin") public Result save(@RequestBody TimbreDataDTO dto) { ValidatorUtils.validateEntity(dto); timbreService.save(dto); return new Result<>(); } + @PutMapping("/{id}") @Operation(summary = "音色修改") - @RequiresPermissions("sys:ttsVoice:update") + @RequiresPermissions("sys:role:superAdmin") public Result update( @PathVariable Long id, @RequestBody TimbreDataDTO dto) { ValidatorUtils.validateEntity(dto); - timbreService.update(id,dto); + timbreService.update(id, dto); return new Result<>(); } + @DeleteMapping("/{id}") @Operation(summary = "音色删除") - @RequiresPermissions("sys:ttsVoice:delete") + @RequiresPermissions("sys:role:superAdmin") public Result delete(@PathVariable Long id) { timbreService.delete(new Long[]{id}); return new Result<>(); } - } \ No newline at end of file diff --git a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/dao/TimbreDao.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/dao/TimbreDao.java similarity index 73% rename from main/manager-api/src/main/java/xiaozhi/modules/Timbre/dao/TimbreDao.java rename to main/manager-api/src/main/java/xiaozhi/modules/timbre/dao/TimbreDao.java index d3273eed..62afa358 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/dao/TimbreDao.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/dao/TimbreDao.java @@ -1,8 +1,8 @@ -package xiaozhi.modules.Timbre.dao; +package xiaozhi.modules.timbre.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import xiaozhi.modules.Timbre.entity.TimbreEntity; +import xiaozhi.modules.timbre.entity.TimbreEntity; /** * 音色持久层定义 diff --git a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/dto/TimbreDataDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbreDataDTO.java similarity index 97% rename from main/manager-api/src/main/java/xiaozhi/modules/Timbre/dto/TimbreDataDTO.java rename to main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbreDataDTO.java index 70d44df1..08ed9b18 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/dto/TimbreDataDTO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbreDataDTO.java @@ -1,4 +1,4 @@ -package xiaozhi.modules.Timbre.dto; +package xiaozhi.modules.timbre.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/dto/TimbrePageDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbrePageDTO.java similarity index 94% rename from main/manager-api/src/main/java/xiaozhi/modules/Timbre/dto/TimbrePageDTO.java rename to main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbrePageDTO.java index 55789c88..72ed68b1 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/dto/TimbrePageDTO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbrePageDTO.java @@ -1,4 +1,4 @@ -package xiaozhi.modules.Timbre.dto; +package xiaozhi.modules.timbre.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/entity/TimbreEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/entity/TimbreEntity.java similarity index 96% rename from main/manager-api/src/main/java/xiaozhi/modules/Timbre/entity/TimbreEntity.java rename to main/manager-api/src/main/java/xiaozhi/modules/timbre/entity/TimbreEntity.java index 23f71c59..71bd58a9 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/entity/TimbreEntity.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/entity/TimbreEntity.java @@ -1,4 +1,4 @@ -package xiaozhi.modules.Timbre.entity; +package xiaozhi.modules.timbre.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/service/TimbreService.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/service/TimbreService.java similarity index 80% rename from main/manager-api/src/main/java/xiaozhi/modules/Timbre/service/TimbreService.java rename to main/manager-api/src/main/java/xiaozhi/modules/timbre/service/TimbreService.java index 7166c9c3..9b6c73eb 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/service/TimbreService.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/service/TimbreService.java @@ -1,11 +1,11 @@ -package xiaozhi.modules.Timbre.service; +package xiaozhi.modules.timbre.service; import xiaozhi.common.page.PageData; import xiaozhi.common.service.BaseService; -import xiaozhi.modules.Timbre.dto.TimbreDataDTO; -import xiaozhi.modules.Timbre.dto.TimbrePageDTO; -import xiaozhi.modules.Timbre.entity.TimbreEntity; -import xiaozhi.modules.Timbre.vo.TimbreDetailsVO; +import xiaozhi.modules.timbre.dto.TimbreDataDTO; +import xiaozhi.modules.timbre.dto.TimbrePageDTO; +import xiaozhi.modules.timbre.entity.TimbreEntity; +import xiaozhi.modules.timbre.vo.TimbreDetailsVO; /** diff --git a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/service/impl/TimbreServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/service/impl/TimbreServiceImpl.java similarity index 88% rename from main/manager-api/src/main/java/xiaozhi/modules/Timbre/service/impl/TimbreServiceImpl.java rename to main/manager-api/src/main/java/xiaozhi/modules/timbre/service/impl/TimbreServiceImpl.java index dddd0103..ce3c2b7b 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/service/impl/TimbreServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/service/impl/TimbreServiceImpl.java @@ -1,4 +1,4 @@ -package xiaozhi.modules.Timbre.service.impl; +package xiaozhi.modules.timbre.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,12 +9,12 @@ import xiaozhi.common.constant.Constant; import xiaozhi.common.page.PageData; import xiaozhi.common.service.impl.BaseServiceImpl; import xiaozhi.common.utils.ConvertUtils; -import xiaozhi.modules.Timbre.dao.TimbreDao; -import xiaozhi.modules.Timbre.dto.TimbreDataDTO; -import xiaozhi.modules.Timbre.dto.TimbrePageDTO; -import xiaozhi.modules.Timbre.service.TimbreService; -import xiaozhi.modules.Timbre.entity.TimbreEntity; -import xiaozhi.modules.Timbre.vo.TimbreDetailsVO; +import xiaozhi.modules.timbre.dao.TimbreDao; +import xiaozhi.modules.timbre.dto.TimbreDataDTO; +import xiaozhi.modules.timbre.dto.TimbrePageDTO; +import xiaozhi.modules.timbre.service.TimbreService; +import xiaozhi.modules.timbre.entity.TimbreEntity; +import xiaozhi.modules.timbre.vo.TimbreDetailsVO; import java.util.Arrays; import java.util.HashMap; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/vo/TimbreDetailsVO.java b/main/manager-api/src/main/java/xiaozhi/modules/timbre/vo/TimbreDetailsVO.java similarity index 95% rename from main/manager-api/src/main/java/xiaozhi/modules/Timbre/vo/TimbreDetailsVO.java rename to main/manager-api/src/main/java/xiaozhi/modules/timbre/vo/TimbreDetailsVO.java index 2918af41..fc82a5d0 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/Timbre/vo/TimbreDetailsVO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/timbre/vo/TimbreDetailsVO.java @@ -1,4 +1,4 @@ -package xiaozhi.modules.Timbre.vo; +package xiaozhi.modules.timbre.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data;