From d1b6a13a58afa4e03f4d6cb0a62cd759ccf306f4 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期二, 04 三月 2025 10:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
ruoyi-modules/ruoyi-fusion/src/main/java/org/ruoyi/fusion/controller/VoiceController.java | 78 ++------------------------------------
1 files changed, 5 insertions(+), 73 deletions(-)
diff --git a/ruoyi-modules/ruoyi-fusion/src/main/java/org/ruoyi/fusion/controller/VoiceController.java b/ruoyi-modules/ruoyi-fusion/src/main/java/org/ruoyi/fusion/controller/VoiceController.java
index 0a6b16c..2909597 100644
--- a/ruoyi-modules/ruoyi-fusion/src/main/java/org/ruoyi/fusion/controller/VoiceController.java
+++ b/ruoyi-modules/ruoyi-fusion/src/main/java/org/ruoyi/fusion/controller/VoiceController.java
@@ -1,31 +1,19 @@
package org.ruoyi.fusion.controller;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.ruoyi.common.core.domain.R;
-import org.ruoyi.common.core.validate.EditGroup;
-import org.ruoyi.common.log.annotation.Log;
-import org.ruoyi.common.log.enums.BusinessType;
-import org.ruoyi.common.satoken.utils.LoginHelper;
import org.ruoyi.common.web.core.BaseController;
-import org.ruoyi.system.domain.bo.VoiceRoleBo;
-import org.ruoyi.system.domain.vo.VoiceRoleVo;
import org.ruoyi.system.request.RoleListDto;
-import org.ruoyi.system.request.RoleRequest;
import org.ruoyi.system.request.SimpleGenerateRequest;
import org.ruoyi.system.response.SimpleGenerateDataResponse;
-import org.ruoyi.system.response.rolelist.RoleListVO;
-import org.ruoyi.system.service.IVoiceRoleService;
-import org.springframework.validation.annotation.Validated;
+import org.ruoyi.system.response.rolelist.ChatAppStoreVO;
+import org.ruoyi.system.service.IChatAppStoreService;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
import java.util.List;
/**
- * 閰嶉煶瑙掕壊
+ * 搴旂敤甯傚満
*
* @author Lion Li
* @date 2024-03-19
@@ -35,63 +23,7 @@
@RequestMapping("/system/voice")
public class VoiceController extends BaseController {
- private final IVoiceRoleService voiceRoleService;
-
- /**
- * 鏌ヨ閰嶉煶瑙掕壊鍒楄〃
- */
- @GetMapping("/list")
- public List<VoiceRoleVo> list(VoiceRoleBo bo) {
- if(LoginHelper.getUserId() == null){
- return new ArrayList<>();
- }
- bo.setCreateBy(LoginHelper.getUserId());
- return voiceRoleService.queryList(bo);
- }
-
- /**
- * 鑾峰彇閰嶉煶瑙掕壊璇︾粏淇℃伅
- *
- * @param id 涓婚敭
- */
- @SaCheckPermission("system:role:query")
- @GetMapping("/{id}")
- public R<VoiceRoleVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long id) {
- return R.ok(voiceRoleService.queryById(id));
- }
-
-
- /**
- * 鏂板閰嶉煶瑙掕壊
- */
- @Log(title = "閰嶉煶瑙掕壊", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- public R<Void> add(@RequestBody RoleRequest roleRequest) {
- return toAjax(voiceRoleService.insertByBo(roleRequest));
- }
-
- /**
- * 淇敼閰嶉煶瑙掕壊
- */
- @SaCheckPermission("system:role:edit")
- @Log(title = "閰嶉煶瑙掕壊", businessType = BusinessType.UPDATE)
- @PutMapping()
- public R<Void> edit(@Validated(EditGroup.class) @RequestBody VoiceRoleBo bo) {
- return toAjax(voiceRoleService.updateByBo(bo));
- }
-
- /**
- * 鍒犻櫎閰嶉煶瑙掕壊
- *
- * @param ids 涓婚敭涓�
- */
- @Log(title = "閰嶉煶瑙掕壊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ids) {
- return toAjax(voiceRoleService.deleteWithValidByIds(List.of(ids), true));
- }
+ private final IChatAppStoreService voiceRoleService;
/**
* 瀹炴椂璇煶鐢熸垚
@@ -105,7 +37,7 @@
* 瑙掕壊甯傚満
*/
@GetMapping("/roleList")
- public R<List<RoleListVO>> roleList() {
+ public R<List<ChatAppStoreVO>> roleList() {
return R.ok(voiceRoleService.roleList());
}
--
Gitblit v1.9.3