diff --git a/suimangCApi/src/main/java/com/iformall/controller/VideoController.java b/suimangCApi/src/main/java/com/iformall/controller/VideoController.java index ec11a6f..55ba5e1 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VideoController.java @@ -29,7 +29,7 @@ public class VideoController extends BaseController { @Autowired VideoFactory videoFactory; - + @Autowired String videoType; @@ -68,7 +68,7 @@ public class VideoController extends BaseController { return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); } } - + /** * 上传视频 * @@ -89,7 +89,7 @@ public class VideoController extends BaseController { return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); } } - + /** * 上传视频 * diff --git a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java index 39f887d..451aae4 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java @@ -169,11 +169,11 @@ public class VoiceMouldController extends BaseController { } /** - * 视频模板列表 + * 音频模板列表 */ @AuthIgnore @PostMapping("/audioList") - @ApiOperation(value = "视频模板列表", notes = "{\"username\",\"string\",\"code\",\"string\"}") + @ApiOperation(value = "音频模板列表", notes = "{\"username\",\"string\",\"code\",\"string\"}") public ResultData audioList(@RequestBody Map params) { String username = params.get("username"); diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java index 84f3484..6a7fb2c 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java @@ -34,7 +34,8 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { @Override public List chooseType(Long id) { - List voiceInfos = voiceMapper.selectList(new LambdaQueryWrapper().eq(VoiceInfo::getLanguageId, id).orderByAsc(VoiceInfo::getDisplayName)); + List voiceInfos = voiceMapper.selectList( + new LambdaQueryWrapper().eq(VoiceInfo::getLanguageId, id).orderByAsc(VoiceInfo::getAgeType).orderByAsc(VoiceInfo::getDisplayName)); voiceInfos.forEach(x -> { if (StringUtils.isNotEmpty(x.getStyleList())) { List strings = JSON.parseArray(x.getStyleList(), String.class);