| @@ -29,7 +29,7 @@ public class VideoController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| VideoFactory videoFactory; | VideoFactory videoFactory; | ||||
| @Autowired | @Autowired | ||||
| String videoType; | String videoType; | ||||
| @@ -68,7 +68,7 @@ public class VideoController extends BaseController { | |||||
| return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); | return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); | ||||
| } | } | ||||
| } | } | ||||
| /** | /** | ||||
| * 上传视频 | * 上传视频 | ||||
| * | * | ||||
| @@ -89,7 +89,7 @@ public class VideoController extends BaseController { | |||||
| return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); | return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); | ||||
| } | } | ||||
| } | } | ||||
| /** | /** | ||||
| * 上传视频 | * 上传视频 | ||||
| * | * | ||||
| @@ -169,11 +169,11 @@ public class VoiceMouldController extends BaseController { | |||||
| } | } | ||||
| /** | /** | ||||
| * 视频模板列表 | |||||
| * 音频模板列表 | |||||
| */ | */ | ||||
| @AuthIgnore | @AuthIgnore | ||||
| @PostMapping("/audioList") | @PostMapping("/audioList") | ||||
| @ApiOperation(value = "视频模板列表", notes = "{\"username\",\"string\",\"code\",\"string\"}") | |||||
| @ApiOperation(value = "音频模板列表", notes = "{\"username\",\"string\",\"code\",\"string\"}") | |||||
| public ResultData audioList(@RequestBody Map<String, String> params) { | public ResultData audioList(@RequestBody Map<String, String> params) { | ||||
| String username = params.get("username"); | String username = params.get("username"); | ||||
| @@ -34,7 +34,8 @@ public class VoiceInfoServiceImpl implements VoiceInfoService { | |||||
| @Override | @Override | ||||
| public List<VoiceInfo> chooseType(Long id) { | public List<VoiceInfo> chooseType(Long id) { | ||||
| List<VoiceInfo> voiceInfos = voiceMapper.selectList(new LambdaQueryWrapper<VoiceInfo>().eq(VoiceInfo::getLanguageId, id).orderByAsc(VoiceInfo::getDisplayName)); | |||||
| List<VoiceInfo> voiceInfos = voiceMapper.selectList( | |||||
| new LambdaQueryWrapper<VoiceInfo>().eq(VoiceInfo::getLanguageId, id).orderByAsc(VoiceInfo::getAgeType).orderByAsc(VoiceInfo::getDisplayName)); | |||||
| voiceInfos.forEach(x -> { | voiceInfos.forEach(x -> { | ||||
| if (StringUtils.isNotEmpty(x.getStyleList())) { | if (StringUtils.isNotEmpty(x.getStyleList())) { | ||||
| List<String> strings = JSON.parseArray(x.getStyleList(), String.class); | List<String> strings = JSON.parseArray(x.getStyleList(), String.class); | ||||