From 2382a986176170baa2c86ddee2b6de661e6a1455 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 12 Apr 2023 11:07:12 +0800 Subject: [PATCH] //Mould --- .../java/com/iformall/controller/VoiceMouldController.java | 6 ++---- .../src/main/java/com/iformall/domain/po/sm/VoiceMould.java | 2 +- .../src/main/java/com/iformall/enums/EnumPersonType.java | 2 +- .../src/main/java/com/iformall/enums/EnumSpeakType.java | 2 +- .../iformall/service/sm/impl/UserMouldVideoServiceImpl.java | 4 ++++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java index aedf515..14671a9 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java @@ -8,10 +8,7 @@ import com.iformall.domain.po.sm.MouldPatch; import com.iformall.domain.po.sm.PersonMould; import com.iformall.domain.po.sm.UserMouldVideo; import com.iformall.domain.po.sm.VoiceMould; -import com.iformall.enums.EnumLanguages; -import com.iformall.enums.EnumMouldPatchType; -import com.iformall.enums.EnumMouldSendType; -import com.iformall.enums.EnumaMouldPatchStatus; +import com.iformall.enums.*; import com.iformall.language.LanguageDetect; import com.iformall.service.sm.MouldPatchService; import com.iformall.service.sm.MouldPatchSignService; @@ -70,6 +67,7 @@ public class VoiceMouldController extends BaseController { && voiceMould.getParentId() == 0l && voiceMould.getCountSub() > 0){ VoiceMould voiceQ = new VoiceMould(); voiceQ.setParentId(voiceMould.getId()); + voiceQ.setVoiceType(EnumVoiceType.speak.getCode());//目前只查询说话风格 voiceQ.setStatus(EnumaMouldPatchStatus.put_on.getCode()); voiceQ.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); List sublist = voiceMouldService.getClist(voiceQ); diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java index 91b2b00..1d0bef7 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java @@ -136,7 +136,7 @@ public class VoiceMould extends TenantEntity { private Integer personType; @TableField(exist = false) private String personTypeStr; - public String getPersonaTypeStr(){ + public String getPersonTypeStr(){ EnumPersonType anEnum = EnumPersonType.getEnum(this.personType); if(anEnum != null){ personTypeStr = anEnum.getMessage(); diff --git a/suimangService/src/main/java/com/iformall/enums/EnumPersonType.java b/suimangService/src/main/java/com/iformall/enums/EnumPersonType.java index a63ac57..4fb77e4 100644 --- a/suimangService/src/main/java/com/iformall/enums/EnumPersonType.java +++ b/suimangService/src/main/java/com/iformall/enums/EnumPersonType.java @@ -14,7 +14,7 @@ public enum EnumPersonType { * | default | 默认风格 | | 默认的语音风格,没做任何风格转换 */ - default_0(0, "默认风格","default"), + default_0(0, "默认","default"), Boy(1, "男孩","Boy"), Girl(2,"女孩","Girl"), OlderAdultFemale(3,"女老年","OlderAdultFemale"), diff --git a/suimangService/src/main/java/com/iformall/enums/EnumSpeakType.java b/suimangService/src/main/java/com/iformall/enums/EnumSpeakType.java index c2208a3..bb8a258 100644 --- a/suimangService/src/main/java/com/iformall/enums/EnumSpeakType.java +++ b/suimangService/src/main/java/com/iformall/enums/EnumSpeakType.java @@ -41,7 +41,7 @@ public enum EnumSpeakType { * | default | 默认风格 | | 默认的语音风格,没做任何风格转换 */ - default_0(0, "默认风格","default"), + default_0(0, "默认","default"), advertisement_upbeat(1, "广告-欢快","advertisement-upbeat"), affectionate(2,"撒娇","affectionate"), angry(3,"愤怒","angry"), diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java index 7a24d72..b8c8be9 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java @@ -118,14 +118,18 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); voiceMouldObject.put("personId",0l); voiceMouldObject.put("personType",0); + voiceMouldObject.put("personTypeStr","默认"); voiceMouldObject.put("speakId",0l); voiceMouldObject.put("speakType",0); + voiceMouldObject.put("speakTypeStr","默认"); if(EnumVoiceType.person.getCode().equals(voiceMould.getVoiceType())){ voiceMouldObject.put("personId",voiceMould.getId()); voiceMouldObject.put("personType",voiceMould.getPersonType()); + voiceMouldObject.put("personTypeStr",voiceMould.getPersonTypeStr()); }else if(EnumVoiceType.speak.getCode().equals(voiceMould.getVoiceType())){ voiceMouldObject.put("speakId",voiceMould.getId()); voiceMouldObject.put("speakType",voiceMould.getPersonType()); + voiceMouldObject.put("speakTypeStr",voiceMould.getSpeakTypeStr()); } record.setVoiceMouldSm(voiceMouldObject.toJSONString()); }