@@ -5,4 +5,7 @@ ALTER TABLE `mallink_suimang_test`.`voice_info` | |||||
ADD COLUMN `age_type` smallint NULL COMMENT '年纪类型 EnumAgeType' AFTER `sex`; | ADD COLUMN `age_type` smallint NULL COMMENT '年纪类型 EnumAgeType' AFTER `sex`; | ||||
ALTER TABLE `mallink_suimang_test`.`photo_speak_video` | ALTER TABLE `mallink_suimang_test`.`photo_speak_video` | ||||
ADD COLUMN `is_hy` smallint NULL DEFAULT 0 COMMENT '是否超分(1、是,2、否)' AFTER `video_hy_status`, | |||||
ADD COLUMN `is_hy` smallint NULL DEFAULT 0 COMMENT '是否超分(1、是,2、否)' AFTER `video_hy_status`, | |||||
ALTER TABLE `mallink_suimang_test`.`voice_material` | |||||
ADD COLUMN `time` double NULL COMMENT '视频时长' AFTER `type`; |
@@ -38,15 +38,15 @@ public class JsonImportController { | |||||
@Transactional(rollbackFor = Exception.class) | @Transactional(rollbackFor = Exception.class) | ||||
@PostMapping("/json") | @PostMapping("/json") | ||||
public ResultData importMethod(@RequestBody List<JsonRootBean> list) { | |||||
public ResultData importLanguage(@RequestBody List<JsonRootBean> list) { | |||||
String str = "https://suimang.oss-accelerate.aliyuncs.com/builtin/country/"; | String str = "https://suimang.oss-accelerate.aliyuncs.com/builtin/country/"; | ||||
HashSet<VoiceLanguage> set = new HashSet<>(); | HashSet<VoiceLanguage> set = new HashSet<>(); | ||||
for (JsonRootBean bean : list) { | for (JsonRootBean bean : list) { | ||||
VoiceLanguage language = new VoiceLanguage(); | VoiceLanguage language = new VoiceLanguage(); | ||||
String[] split = bean.getLocale().split("-"); | String[] split = bean.getLocale().split("-"); | ||||
language.setCountry(split[0]); | |||||
language.setLanguage(split[1]); | |||||
language.setImg(str + split[0] + ".png"); | |||||
language.setCountry(split[1]); | |||||
language.setLanguage(split[0]); | |||||
language.setImg(str + split[1].toLowerCase() + ".png"); | |||||
language.setLocal(bean.getLocale()); | language.setLocal(bean.getLocale()); | ||||
language.setName(bean.getLocaleName()); | language.setName(bean.getLocaleName()); | ||||
language.setIsDel(0); | language.setIsDel(0); | ||||
@@ -55,7 +55,12 @@ public class JsonImportController { | |||||
set.add(language); | set.add(language); | ||||
} | } | ||||
voiceLanguageMapper.saveBatch(set); | voiceLanguageMapper.saveBatch(set); | ||||
return new ResultData("导入完成"); | |||||
} | |||||
@Transactional(rollbackFor = Exception.class) | |||||
@PostMapping("/language") | |||||
public ResultData importVoiceInfo(@RequestBody List<JsonRootBean> list) { | |||||
List<VoiceInfo> list1 = new ArrayList<>(); | List<VoiceInfo> list1 = new ArrayList<>(); | ||||
for (JsonRootBean bean : list) { | for (JsonRootBean bean : list) { | ||||
Date date = new Date(); | Date date = new Date(); | ||||
@@ -66,8 +71,7 @@ public class JsonImportController { | |||||
voiceInfo.setId(voiceMould.getId()); | voiceInfo.setId(voiceMould.getId()); | ||||
} | } | ||||
VoiceLanguage voiceLanguage = voiceLanguageMapper.selectOne(new QueryWrapper<VoiceLanguage>().lambda().eq(VoiceLanguage::getLocal, bean.getLocale())); | VoiceLanguage voiceLanguage = voiceLanguageMapper.selectOne(new QueryWrapper<VoiceLanguage>().lambda().eq(VoiceLanguage::getLocal, bean.getLocale())); | ||||
logger.info(voiceLanguage.toString()); | |||||
if (!ObjectUtils.isEmpty(voiceLanguage)) { | |||||
if (voiceLanguage.getId() != null) { | |||||
voiceInfo.setLanguageId(voiceLanguage.getId()); | voiceInfo.setLanguageId(voiceLanguage.getId()); | ||||
} else { | } else { | ||||
System.out.println(bean.getName()); | System.out.println(bean.getName()); | ||||
@@ -14,7 +14,7 @@ import java.util.List; | |||||
/** | /** | ||||
* 声音表 | * 声音表 | ||||
*/ | */ | ||||
@TableName(value = "voice_info_copy1") | |||||
@TableName(value = "voice_info") | |||||
@Data | @Data | ||||
@ToString(callSuper = true) | @ToString(callSuper = true) | ||||
@EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
@@ -13,7 +13,7 @@ import java.util.Objects; | |||||
/** | /** | ||||
* 语种表 | * 语种表 | ||||
*/ | */ | ||||
@TableName(value = "voice_language_copy1") | |||||
@TableName(value = "voice_language") | |||||
@Data | @Data | ||||
@ToString(callSuper = true) | @ToString(callSuper = true) | ||||
@EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
@@ -3,7 +3,7 @@ | |||||
<mapper namespace="com.iformall.mapper.VoiceLanguageMapper"> | <mapper namespace="com.iformall.mapper.VoiceLanguageMapper"> | ||||
<insert id="saveBatch" parameterType="java.util.HashSet"> | <insert id="saveBatch" parameterType="java.util.HashSet"> | ||||
INSERT INTO voice_language (`id`, `country`, | INSERT INTO voice_language (`id`, `country`, | ||||
`language`, `local`, `name`, `img`, `is_del`) | |||||
`language`, `local`, `name`, `img`, `is_del`,`chinese_name`) | |||||
VALUES | VALUES | ||||
<foreach collection="set" item="item" separator=","> | <foreach collection="set" item="item" separator=","> | ||||
( | ( | ||||
@@ -13,7 +13,8 @@ | |||||
#{item.local}, | #{item.local}, | ||||
#{item.name}, | #{item.name}, | ||||
#{item.img}, | #{item.img}, | ||||
#{item.isDel} | |||||
#{item.isDel}, | |||||
#{item.chineseName} | |||||
) | ) | ||||
</foreach> | </foreach> | ||||
</insert> | </insert> | ||||
@@ -5,7 +5,7 @@ | |||||
INSERT INTO voice_info (`id`, `language_id`, `sex`, | INSERT INTO voice_info (`id`, `language_id`, `sex`, | ||||
`display_name`, `local_name`, `mould_sm_id`, | `display_name`, `local_name`, `mould_sm_id`, | ||||
`sample_rate_hertz`, `words_per_minute`, `voice_type`, | `sample_rate_hertz`, `words_per_minute`, `voice_type`, | ||||
`style_list`, `create_date`, `update_date`, `is_del`) | |||||
`style_list`, `create_date`, `update_date`, `is_del`,`age_type`) | |||||
VALUES | VALUES | ||||
<foreach collection="list" item="item" separator=","> | <foreach collection="list" item="item" separator=","> | ||||
( | ( | ||||
@@ -21,7 +21,8 @@ | |||||
#{item.styleList}, | #{item.styleList}, | ||||
#{item.createDate}, | #{item.createDate}, | ||||
#{item.updateDate}, | #{item.updateDate}, | ||||
#{item.isDel} | |||||
#{item.isDel}, | |||||
#{item.ageType} | |||||
) | ) | ||||
</foreach> | </foreach> | ||||
</insert> | </insert> | ||||