From a1730b2d5289adad98f8ca5f42e5966028ba60c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Fri, 21 Mar 2025 14:57:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9F=B3=E8=89=B2?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E5=8A=9F=E8=83=BD=20--TimbreControl?= =?UTF-8?q?ler.java=20=E9=9F=B3=E8=89=B2=E6=8E=A7=E5=88=B6=E5=B1=82?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=88=86=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E4=BF=9D=E5=AD=98=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=20--TimbreDetailsVO.java=20?= =?UTF-8?q?=E9=9F=B3=E8=89=B2=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=20--TimbrePageDTO.java=20=E9=9F=B3=E8=89=B2=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=8F=82=E6=95=B0=20--TimbreDataDTO.java=20=E9=9F=B3?= =?UTF-8?q?=E8=89=B2=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0?= =?UTF-8?q?=20--TimbreDao.java=20=E9=9F=B3=E8=89=B2=E6=8C=81=E4=B9=85?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=20--TimbreService.java=20=E9=9F=B3=E8=89=B2?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=B1=82=E5=AE=9A=E4=B9=89=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E5=88=86=E9=A1=B5=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E5=AD=98=EF=BC=8C=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AF=A6=E6=83=85=20--TimbreServiceImpl.java?= =?UTF-8?q?=20--TimbreEntity.java=20=E9=9F=B3=E8=89=B2=E8=A1=A8=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Timbre/controller/TimbreController.java | 57 +++++++++++++ .../xiaozhi/modules/Timbre/dao/TimbreDao.java | 14 +++ .../modules/Timbre/dto/TimbreDataDTO.java | 36 ++++++++ .../modules/Timbre/dto/TimbrePageDTO.java | 26 ++++++ .../modules/Timbre/entity/TimbreEntity.java | 48 +++++++++++ .../modules/Timbre/service/TimbreService.java | 49 +++++++++++ .../service/impl/TimbreServiceImpl.java | 85 +++++++++++++++++++ .../modules/Timbre/vo/TimbreDetailsVO.java | 35 ++++++++ 8 files changed, 350 insertions(+) create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/Timbre/controller/TimbreController.java create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/Timbre/dao/TimbreDao.java create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/Timbre/dto/TimbreDataDTO.java create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/Timbre/dto/TimbrePageDTO.java create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/Timbre/entity/TimbreEntity.java create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/Timbre/service/TimbreService.java create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/Timbre/service/impl/TimbreServiceImpl.java create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/Timbre/vo/TimbreDetailsVO.java 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 new file mode 100644 index 00000000..41972f27 --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/Timbre/controller/TimbreController.java @@ -0,0 +1,57 @@ +package xiaozhi.modules.Timbre.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; +import xiaozhi.common.page.PageData; +import xiaozhi.common.utils.Result; +import xiaozhi.modules.Timbre.dto.TimbreDataDTO; +import xiaozhi.modules.Timbre.dto.TimbrePageDTO; +import xiaozhi.modules.Timbre.service.TimbreService; +import xiaozhi.modules.Timbre.vo.TimbreDetailsVO; + +/** + * 音色控制层 + * @author zjy + * @since 2025-3-21 + */ +@AllArgsConstructor +@RestController +@RequestMapping("/ttsVoice") +@Tag(name = "音色管理") +public class TimbreController { + private final TimbreService timbreService; + + @GetMapping + @Operation(summary = "分页查找") +// @RequiresPermissions("sys:role:normal") + public Result> page(@RequestParam TimbrePageDTO dto) { + PageData page = timbreService.page(dto); + return new Result>().ok(page); + } + @PostMapping + @Operation(summary = "音色保存") +// @RequiresPermissions("sys:role:normal") + public Result save(@RequestBody TimbreDataDTO dto) { + timbreService.save(dto); + return new Result<>(); + } + @PutMapping("/{id}") + @Operation(summary = "音色修改") +// @RequiresPermissions("sys:role:normal") + public Result update(@PathVariable Long id,@RequestBody TimbreDataDTO dto) { + timbreService.update(id,dto); + return new Result<>(); + } + @DeleteMapping("/{id}") + @Operation(summary = "音色删除") +// @RequiresPermissions("sys:role:normal") + 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 new file mode 100644 index 00000000..d3273eed --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/Timbre/dao/TimbreDao.java @@ -0,0 +1,14 @@ +package xiaozhi.modules.Timbre.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import xiaozhi.modules.Timbre.entity.TimbreEntity; + +/** + * 音色持久层定义 + * @author zjy + * @since 2025-3-21 + */ +@Mapper +public interface TimbreDao extends BaseMapper { +} \ No newline at end of file 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 new file mode 100644 index 00000000..6ba7c47e --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/Timbre/dto/TimbreDataDTO.java @@ -0,0 +1,36 @@ +package xiaozhi.modules.Timbre.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + +/** + * 音色表数据DTO + * @author zjy + * @since 2025-3-21 + */ +@Data +@Schema(description = "音色表信息") +public class TimbreDataDTO { + + @Schema(description = "语言") + private String languages; + + @Schema(description = "音色名称") + private String name; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "排序") + private long sort; + + @Schema(description = "对应 TTS 模型主键") + private String ttsModelId; + + @Schema(description = "音色编码") + private String ttsVoice; + + @Schema(description = "音频播放地址") + private String voiceDemo; +} \ No newline at end of file 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 new file mode 100644 index 00000000..958d6d47 --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/Timbre/dto/TimbrePageDTO.java @@ -0,0 +1,26 @@ +package xiaozhi.modules.Timbre.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 音色分页参数DTO + * @author zjy + * @since 2025-3-21 + */ +@Data +@Schema(description = "音色分页参数") +public class TimbrePageDTO { + + @Schema(description = "对应 TTS 模型主键") + private String ttsModelId; + + @Schema(description = "音色名称") + private String name; + + @Schema(description = "页数") + private Long page; + + @Schema(description = "显示列数") + private Long limit; +} 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 new file mode 100644 index 00000000..23f71c59 --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/Timbre/entity/TimbreEntity.java @@ -0,0 +1,48 @@ +package xiaozhi.modules.Timbre.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import xiaozhi.common.entity.BaseEntity; + +import java.util.Date; + +/** + * 音色表实体类 + * @author zjy + * @since 2025-3-21 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ai_tts_voice") +@Schema(description = "音色信息") +public class TimbreEntity extends BaseEntity { + + @Schema(description = "语言") + private String languages; + + @Schema(description = "音色名称") + private String name; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "排序") + private long sort; + + @Schema(description = "对应 TTS 模型主键") + private String ttsModelId; + + @Schema(description = "音色编码") + private String ttsVoice; + + @Schema(description = "音频播放地址") + private String voiceDemo; + + @Schema(description = "更新者") + private Long updater; + + @Schema(description = "更新时间") + private Date updateDate; +} \ No newline at end of file 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 new file mode 100644 index 00000000..7166c9c3 --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/Timbre/service/TimbreService.java @@ -0,0 +1,49 @@ +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; + + +/** + * 音色的业务层的定义 + * @author zjy + * @since 2025-3-21 + */ +public interface TimbreService extends BaseService { + /** + * 分页获取音色指定tts的下的音色 + * @param dto 分页查找参数 + * @return 音色列表分页数据 + */ + PageData page(TimbrePageDTO dto); + + /** + * 获取音色指定id的详情信息 + * @param timbreId 音色表id + * @return 音色信息 + */ + TimbreDetailsVO get(Long timbreId); + + /** + * 保存音色信息 + * @param dto 需要保存数据 + */ + void save(TimbreDataDTO dto); + + /** + * 保存音色信息 + * @param timbreId 需要修改的id + * @param dto 需要修改的数据 + */ + void update(Long timbreId,TimbreDataDTO dto); + + /** + * 批量删除音色 + * @param ids 需要被删除的音色id列表 + */ + void delete(Long[] ids); +} \ No newline at end of file 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 new file mode 100644 index 00000000..dddd0103 --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/Timbre/service/impl/TimbreServiceImpl.java @@ -0,0 +1,85 @@ +package xiaozhi.modules.Timbre.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +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 java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +/** + * 音色的业务层的实现 + * @author zjy + * @since 2025-3-21 + */ +@Service +public class TimbreServiceImpl extends BaseServiceImpl implements TimbreService { + + + @Override + public PageData page(TimbrePageDTO dto) { + Map params = new HashMap(); + params.put(Constant.PAGE, dto.getPage()); + params.put(Constant.LIMIT,dto.getLimit()); + IPage page = baseDao.selectPage( + getPage(params, "sort", true), + //定义查询条件 + new QueryWrapper() + //必须按照ttsID查找 + .eq("tts_model_id",dto.getTtsModelId()) + //如果有音色名字，按照音色名模糊查找 + .like(StringUtils.isNotBlank(dto.getName()),"name",dto.getName()) + ); + + return getPageData(page, TimbreDetailsVO.class); + } + + @Override + public TimbreDetailsVO get(Long timbreId) { + TimbreEntity entity = baseDao.selectById(timbreId); + return ConvertUtils.sourceToTarget(entity, TimbreDetailsVO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(TimbreDataDTO dto) { + isTtsModelId(dto.getTtsModelId()); + TimbreEntity timbreEntity = ConvertUtils.sourceToTarget(dto, TimbreEntity.class); + baseDao.insert(timbreEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(Long timbreId, TimbreDataDTO dto) { + isTtsModelId(dto.getTtsModelId()); + TimbreEntity timbreEntity = ConvertUtils.sourceToTarget(dto, TimbreEntity.class); + timbreEntity.setId(timbreId); + baseDao.updateById(timbreEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(Long[] ids) { + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 处理是不是tts模型的id + */ + private void isTtsModelId(String ttsModelId){ + //等模型配置那边写好调用方法判断 + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..5384d356 --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/Timbre/vo/TimbreDetailsVO.java @@ -0,0 +1,35 @@ +package xiaozhi.modules.Timbre.vo; + +import io.swagger.v3.oas.annotations.media.Schema; + +/** + * 音色详情展示VO + * @author zjy + * @since 2025-3-21 + */ +public class TimbreDetailsVO { + @Schema(description = "音色id") + private Long id; + + @Schema(description = "语言") + private String languages; + + @Schema(description = "音色名称") + private String name; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "排序") + private long sort; + + @Schema(description = "对应 TTS 模型主键") + private String ttsModelId; + + @Schema(description = "音色编码") + private String ttsVoice; + + @Schema(description = "音频播放地址") + private String voiceDemo; + +} From 4c99b40257f9557aa40fc2099451b8d18a337fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Fri, 21 Mar 2025 15:58:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF=20--Ti?= =?UTF-8?q?mbreController.java=20=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E8=AF=B7=E6=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E9=94=99=E8=AF=AF=20--TimbreDetailsVO.java?= =?UTF-8?q?=20=E7=BB=9F=E4=B8=80=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=B8=BAstring=20--TimbrePageDTO.java=20=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaozhi/modules/Timbre/controller/TimbreController.java | 2 +- .../main/java/xiaozhi/modules/Timbre/dto/TimbrePageDTO.java | 4 ++-- .../java/xiaozhi/modules/Timbre/vo/TimbreDetailsVO.java | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) 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 41972f27..4a3875e2 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 @@ -26,7 +26,7 @@ public class TimbreController { @GetMapping @Operation(summary = "分页查找") // @RequiresPermissions("sys:role:normal") - public Result> page(@RequestParam TimbrePageDTO dto) { + public Result> page(@ModelAttribute TimbrePageDTO dto) { PageData page = timbreService.page(dto); return new Result>().ok(page); } 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 index 958d6d47..baa6416d 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 @@ -19,8 +19,8 @@ public class TimbrePageDTO { private String name; @Schema(description = "页数") - private Long page; + private String page; @Schema(description = "显示列数") - private Long limit; + private String limit; } 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 index 5384d356..2918af41 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,13 +1,17 @@ package xiaozhi.modules.Timbre.vo; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; /** * 音色详情展示VO * @author zjy * @since 2025-3-21 */ -public class TimbreDetailsVO { +@Data +public class TimbreDetailsVO implements Serializable { @Schema(description = "音色id") private Long id; From a1e959420dd14d29f5644a3c2da9a258ed21affe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Fri, 21 Mar 2025 16:07:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=BA=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=20--TimbreControl?= =?UTF-8?q?ler.java=20=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/Timbre/controller/TimbreController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 4a3875e2..766b13b6 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,6 +3,7 @@ package xiaozhi.modules.Timbre.controller; import io.swagger.v3.oas.annotations.Operation; 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.page.PageData; import xiaozhi.common.utils.Result; @@ -25,28 +26,28 @@ public class TimbreController { @GetMapping @Operation(summary = "分页查找") -// @RequiresPermissions("sys:role:normal") + @RequiresPermissions("sys:ttsVoice:select") public Result> page(@ModelAttribute TimbrePageDTO dto) { PageData page = timbreService.page(dto); return new Result>().ok(page); } @PostMapping @Operation(summary = "音色保存") -// @RequiresPermissions("sys:role:normal") + @RequiresPermissions("sys:ttsVoice:save") public Result save(@RequestBody TimbreDataDTO dto) { timbreService.save(dto); return new Result<>(); } @PutMapping("/{id}") @Operation(summary = "音色修改") -// @RequiresPermissions("sys:role:normal") + @RequiresPermissions("sys:ttsVoice:update") public Result update(@PathVariable Long id,@RequestBody TimbreDataDTO dto) { timbreService.update(id,dto); return new Result<>(); } @DeleteMapping("/{id}") @Operation(summary = "音色删除") -// @RequiresPermissions("sys:role:normal") + @RequiresPermissions("sys:ttsVoice:delete") public Result delete(@PathVariable Long id) { timbreService.delete(new Long[]{id}); return new Result<>(); From 36d13707209e166960ca3d5a22f9cd90986f0eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Fri, 21 Mar 2025 17:26:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=8F=82=E6=95=B0=E9=AA=8C=E8=AF=81=20--TimbreControl?= =?UTF-8?q?ler.java=20=E9=AA=8C=E8=AF=81=E5=8F=82=E6=95=B0=20--TimbreDataD?= =?UTF-8?q?TO.java=20--TimbreDataDTO.java=20=E5=AE=9A=E4=B9=89=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=AA=8C=E8=AF=81=20--validation.properties=20--valid?= =?UTF-8?q?ation=5Fen=5FUS.properties=20--validation=5Fzh=5FCN.properties?= =?UTF-8?q?=20--validation=5Fzh=5FTW.properties=20=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=AA=8C=E8=AF=81=E5=A4=B1=E8=B4=A5=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/Timbre/controller/TimbreController.java | 8 +++++++- .../java/xiaozhi/modules/Timbre/dto/TimbreDataDTO.java | 9 +++++++++ .../java/xiaozhi/modules/Timbre/dto/TimbrePageDTO.java | 2 ++ .../src/main/resources/i18n/validation.properties | 9 +++++++++ .../src/main/resources/i18n/validation_en_US.properties | 8 ++++++++ .../src/main/resources/i18n/validation_zh_CN.properties | 7 +++++++ .../src/main/resources/i18n/validation_zh_TW.properties | 7 +++++++ 7 files changed, 49 insertions(+), 1 deletion(-) 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 766b13b6..bba48abf 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 @@ -7,6 +7,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; 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; @@ -28,6 +29,7 @@ public class TimbreController { @Operation(summary = "分页查找") @RequiresPermissions("sys:ttsVoice:select") public Result> page(@ModelAttribute TimbrePageDTO dto) { + ValidatorUtils.validateEntity(dto); PageData page = timbreService.page(dto); return new Result>().ok(page); } @@ -35,13 +37,17 @@ public class TimbreController { @Operation(summary = "音色保存") @RequiresPermissions("sys:ttsVoice:save") public Result save(@RequestBody TimbreDataDTO dto) { + ValidatorUtils.validateEntity(dto); timbreService.save(dto); return new Result<>(); } @PutMapping("/{id}") @Operation(summary = "音色修改") @RequiresPermissions("sys:ttsVoice:update") - public Result update(@PathVariable Long id,@RequestBody TimbreDataDTO dto) { + public Result update( + @PathVariable Long id, + @RequestBody TimbreDataDTO dto) { + ValidatorUtils.validateEntity(dto); timbreService.update(id,dto); return new Result<>(); } 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 index 6ba7c47e..70d44df1 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,6 +1,8 @@ package xiaozhi.modules.Timbre.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -14,23 +16,30 @@ import lombok.Data; public class TimbreDataDTO { @Schema(description = "语言") + @NotBlank(message = "{timbre.languages.require}") private String languages; @Schema(description = "音色名称") + @NotBlank(message = "{timbre.name.require}") private String name; @Schema(description = "备注") + @NotBlank(message = "{timbre.remark.require}") private String remark; @Schema(description = "排序") + @Min(value = 0, message = "{sort.number}") private long sort; @Schema(description = "对应 TTS 模型主键") + @NotBlank(message = "{timbre.ttsModelId.require}") private String ttsModelId; @Schema(description = "音色编码") + @NotBlank(message = "{timbre.ttsVoice.require}") private String ttsVoice; @Schema(description = "音频播放地址") + @NotBlank(message = "{timbre.voiceDemo.require}") private String voiceDemo; } \ No newline at end of file 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 index baa6416d..55789c88 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,6 +1,7 @@ package xiaozhi.modules.Timbre.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.Data; /** @@ -13,6 +14,7 @@ import lombok.Data; public class TimbrePageDTO { @Schema(description = "对应 TTS 模型主键") + @NotBlank(message = "{timbre.ttsModelId.require}") private String ttsModelId; @Schema(description = "音色名称") diff --git a/main/manager-api/src/main/resources/i18n/validation.properties b/main/manager-api/src/main/resources/i18n/validation.properties index 947f89cc..e7452e47 100644 --- a/main/manager-api/src/main/resources/i18n/validation.properties +++ b/main/manager-api/src/main/resources/i18n/validation.properties @@ -20,3 +20,12 @@ sysuser.deptId.require=\u90E8\u95E8\u4E0D\u80FD\u4E3A\u7A7A sysuser.status.range=\u72B6\u6001\u53D6\u503C\u8303\u56F40~1 sysuser.captcha.require=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A sysuser.uuid.require=\u552F\u4E00\u6807\u8BC6\u4E0D\u80FD\u4E3A\u7A7A + + +timbre.languages.require=\u97F3\u8272\u7684\u8BED\u8A00\u4E0D\u53EF\u4EE5\u4E3A\u7A7A +timbre.name.require=\u97F3\u8272\u7684\u540D\u79F0\u4E0D\u53EF\u4EE5\u4E3A\u7A7A +timbre.remark.require=\u97F3\u8272\u7684\u5907\u6CE8\u4E0D\u53EF\u4EE5\u4E3A\u7A7A +timbre.ttsModelId.require=\u97F3\u8272\u7684tts\u4E3B\u952E\u4E0D\u53EF\u4EE5\u4E3A\u7A7A +timbre.ttsVoice.require=\u97F3\u8272\u7684\u7F16\u7801\u4E0D\u53EF\u4EE5\u4E3A\u7A7A +timbre.voiceDemo.require=\u97F3\u8272\u7684\u64AD\u653EDemo\u4E0D\u53EF\u4EE5\u4E3A\u7A7A + diff --git a/main/manager-api/src/main/resources/i18n/validation_en_US.properties b/main/manager-api/src/main/resources/i18n/validation_en_US.properties index f8bb6e94..37bebf18 100644 --- a/main/manager-api/src/main/resources/i18n/validation_en_US.properties +++ b/main/manager-api/src/main/resources/i18n/validation_en_US.properties @@ -20,3 +20,11 @@ sysuser.deptId.require=Departments cannot be empty sysuser.status.range=State ranges from 0 to 1 sysuser.captcha.require=The captcha cannot be empty sysuser.uuid.require=The unique identifier cannot be empty + +timbre.languages.require=The language of the timbre cannot be empty +timbre.name.require=The name of the timbre cannot be empty +timbre.remark.require=The remark of the timbre cannot be empty +timbre.ttsModelId.require=The TTS model ID of the timbre cannot be empty +timbre.ttsVoice.require=The TTS voice of the timbre cannot be empty +timbre.voiceDemo.require=The voice demo of the timbre cannot be empty + diff --git a/main/manager-api/src/main/resources/i18n/validation_zh_CN.properties b/main/manager-api/src/main/resources/i18n/validation_zh_CN.properties index ba350d05..41bf1e69 100644 --- a/main/manager-api/src/main/resources/i18n/validation_zh_CN.properties +++ b/main/manager-api/src/main/resources/i18n/validation_zh_CN.properties @@ -21,3 +21,10 @@ sysuser.status.range=\u72B6\u6001\u53D6\u503C\u8303\u56F40~1 sysuser.captcha.require=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A sysuser.uuid.require=\u552F\u4E00\u6807\u8BC6\u4E0D\u80FD\u4E3A\u7A7A +timbre.languages.require=\u97F3\u8272\u7684\u8A9E\u8A00\u4E0D\u53EF\u4EE5\u70BA\u7A7A +timbre.name.require=\u97F3\u8272\u7684\u540D\u7A31\u4E0D\u53EF\u4EE5\u70BA\u7A7A +timbre.remark.require=\u97F3\u8272\u7684\u5099\u6CE8\u4E0D\u53EF\u4EE5\u70BA\u7A7A +timbre.ttsModelId.require=\u97F3\u8272\u7684tts\u4E3B\u9375\u4E0D\u53EF\u4EE5\u70BA\u7A7A +timbre.ttsVoice.require=\u97F3\u8272\u7684\u7DE8\u78BC\u4E0D\u53EF\u4EE5\u70BA\u7A7A +timbre.voiceDemo.require=\u97F3\u8272\u7684\u64AD\u653E\u5730\u5740\u4E0D\u53EF\u4EE5\u70BA\u7A7A + diff --git a/main/manager-api/src/main/resources/i18n/validation_zh_TW.properties b/main/manager-api/src/main/resources/i18n/validation_zh_TW.properties index 947f89cc..9241c97a 100644 --- a/main/manager-api/src/main/resources/i18n/validation_zh_TW.properties +++ b/main/manager-api/src/main/resources/i18n/validation_zh_TW.properties @@ -20,3 +20,10 @@ sysuser.deptId.require=\u90E8\u95E8\u4E0D\u80FD\u4E3A\u7A7A sysuser.status.range=\u72B6\u6001\u53D6\u503C\u8303\u56F40~1 sysuser.captcha.require=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A sysuser.uuid.require=\u552F\u4E00\u6807\u8BC6\u4E0D\u80FD\u4E3A\u7A7A + +timbre.languages.require=\u97F3\u8272\u7684\u8BED\u8A00\u4E0D\u53EF\u4EE5\u4E3A\u7A7A +timbre.name.require=\u97F3\u8272\u7684\u540D\u79F0\u4E0D\u53EF\u4EE5\u4E3A\u7A7A +timbre.remark.require=\u97F3\u8272\u7684\u5907\u6CE8\u4E0D\u53EF\u4EE5\u4E3A\u7A7A +timbre.ttsModelId.require=\u97F3\u8272\u7684tts\u4E3B\u952E\u4E0D\u53EF\u4EE5\u4E3A\u7A7A +timbre.ttsVoice.require=\u97F3\u8272\u7684\u7F16\u7801\u4E0D\u53EF\u4EE5\u4E3A\u7A7A +timbre.voiceDemo.require=\u97F3\u8272\u7684\u64AD\u653EDemo\u4E0D\u53EF\u4EE5\u4E3A\u7A7A 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 5/5] =?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;