From 5ab8691834a9a96fa61df21a0c87acfd4076fa25 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Fri, 30 Jun 2023 18:11:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5JSON=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V202306291619_voice_info.sql | 5 ++++- .../controller/JsonImportController.java | 16 ++++++++++------ .../com/iformall/domain/po/sm/VoiceInfo.java | 2 +- .../com/iformall/domain/po/sm/VoiceLanguage.java | 2 +- .../resources/mapper/VoiceLanguageMapper.xml | 5 +++-- .../src/main/resources/mapper/VoiceMapper.xml | 5 +++-- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/suimangAdmin/src/main/resources/db/migration/V202306291619_voice_info.sql b/suimangAdmin/src/main/resources/db/migration/V202306291619_voice_info.sql index ef6c979..8424ca5 100644 --- a/suimangAdmin/src/main/resources/db/migration/V202306291619_voice_info.sql +++ b/suimangAdmin/src/main/resources/db/migration/V202306291619_voice_info.sql @@ -5,4 +5,7 @@ ALTER TABLE `mallink_suimang_test`.`voice_info` ADD COLUMN `age_type` smallint NULL COMMENT '年纪类型 EnumAgeType' AFTER `sex`; ALTER TABLE `mallink_suimang_test`.`photo_speak_video` - ADD COLUMN `is_hy` smallint NULL DEFAULT 0 COMMENT '是否超分(1、是,2、否)' AFTER `video_hy_status`, \ No newline at end of file + 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`; \ No newline at end of file diff --git a/suimangCApi/src/main/java/com/iformall/controller/JsonImportController.java b/suimangCApi/src/main/java/com/iformall/controller/JsonImportController.java index 3d726bb..649b988 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/JsonImportController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/JsonImportController.java @@ -38,15 +38,15 @@ public class JsonImportController { @Transactional(rollbackFor = Exception.class) @PostMapping("/json") - public ResultData importMethod(@RequestBody List list) { + public ResultData importLanguage(@RequestBody List list) { String str = "https://suimang.oss-accelerate.aliyuncs.com/builtin/country/"; HashSet set = new HashSet<>(); for (JsonRootBean bean : list) { VoiceLanguage language = new VoiceLanguage(); 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.setName(bean.getLocaleName()); language.setIsDel(0); @@ -55,7 +55,12 @@ public class JsonImportController { set.add(language); } voiceLanguageMapper.saveBatch(set); + return new ResultData("导入完成"); + } + @Transactional(rollbackFor = Exception.class) + @PostMapping("/language") + public ResultData importVoiceInfo(@RequestBody List list) { List list1 = new ArrayList<>(); for (JsonRootBean bean : list) { Date date = new Date(); @@ -66,8 +71,7 @@ public class JsonImportController { voiceInfo.setId(voiceMould.getId()); } VoiceLanguage voiceLanguage = voiceLanguageMapper.selectOne(new QueryWrapper().lambda().eq(VoiceLanguage::getLocal, bean.getLocale())); - logger.info(voiceLanguage.toString()); - if (!ObjectUtils.isEmpty(voiceLanguage)) { + if (voiceLanguage.getId() != null) { voiceInfo.setLanguageId(voiceLanguage.getId()); } else { System.out.println(bean.getName()); diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java index d18f2fe..2c99ba0 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceInfo.java @@ -14,7 +14,7 @@ import java.util.List; /** * 声音表 */ -@TableName(value = "voice_info_copy1") +@TableName(value = "voice_info") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java index 0e81950..d2799f7 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java @@ -13,7 +13,7 @@ import java.util.Objects; /** * 语种表 */ -@TableName(value = "voice_language_copy1") +@TableName(value = "voice_language") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) diff --git a/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml b/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml index e9dfaf0..039a587 100644 --- a/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml +++ b/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml @@ -3,7 +3,7 @@ INSERT INTO voice_language (`id`, `country`, - `language`, `local`, `name`, `img`, `is_del`) + `language`, `local`, `name`, `img`, `is_del`,`chinese_name`) VALUES ( @@ -13,7 +13,8 @@ #{item.local}, #{item.name}, #{item.img}, - #{item.isDel} + #{item.isDel}, + #{item.chineseName} ) diff --git a/suimangService/src/main/resources/mapper/VoiceMapper.xml b/suimangService/src/main/resources/mapper/VoiceMapper.xml index 1fb1703..382f9b0 100644 --- a/suimangService/src/main/resources/mapper/VoiceMapper.xml +++ b/suimangService/src/main/resources/mapper/VoiceMapper.xml @@ -5,7 +5,7 @@ INSERT INTO voice_info (`id`, `language_id`, `sex`, `display_name`, `local_name`, `mould_sm_id`, `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 ( @@ -21,7 +21,8 @@ #{item.styleList}, #{item.createDate}, #{item.updateDate}, - #{item.isDel} + #{item.isDel}, + #{item.ageType} )