From 766effa6e04db9b37b1dc3886d988beaa595c38d Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 12 十二月 2023 09:04:55 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/controller/AudioController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/controller/AudioController.java b/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/controller/AudioController.java
index 33de563..4dc5098 100644
--- a/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/controller/AudioController.java
+++ b/hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/controller/AudioController.java
@@ -3,6 +3,7 @@
import com.thhy.general.common.BasicResult;
import com.thhy.screen.modules.biz.audio.entity.AudioDto;
import com.thhy.screen.modules.biz.audio.entity.AudioGroup;
+import com.thhy.screen.modules.biz.audio.entity.GroupInfoVo;
import com.thhy.screen.modules.biz.audio.service.AudioService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -19,8 +20,8 @@
private AudioService audioService;
@RequestMapping("groups")
- public BasicResult groups(){
- List<AudioGroup> groupList = audioService.queryGroups();
+ public BasicResult groups(@RequestBody AudioDto audioDto){
+ List<AudioGroup> groupList = audioService.queryGroups(audioDto);
return BasicResult.success(groupList);
}
@@ -38,7 +39,7 @@
@RequestMapping("groupInfo")
public BasicResult groupInfo(@RequestBody AudioDto audioDto){
- audioService.groupInfo(audioDto);
- return BasicResult.success();
+ GroupInfoVo infoVo = audioService.groupInfo(audioDto);
+ return BasicResult.success(infoVo);
}
}
--
Gitblit v1.9.3