Browse Source

//Mould

private_deployment
xhxu 1 year ago
parent
commit
2382a98617
5 changed files with 9 additions and 7 deletions
  1. +2
    -4
      suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java
  2. +1
    -1
      suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java
  3. +1
    -1
      suimangService/src/main/java/com/iformall/enums/EnumPersonType.java
  4. +1
    -1
      suimangService/src/main/java/com/iformall/enums/EnumSpeakType.java
  5. +4
    -0
      suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java

+ 2
- 4
suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java View File

@@ -8,10 +8,7 @@ import com.iformall.domain.po.sm.MouldPatch;
import com.iformall.domain.po.sm.PersonMould; import com.iformall.domain.po.sm.PersonMould;
import com.iformall.domain.po.sm.UserMouldVideo; import com.iformall.domain.po.sm.UserMouldVideo;
import com.iformall.domain.po.sm.VoiceMould; 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.language.LanguageDetect;
import com.iformall.service.sm.MouldPatchService; import com.iformall.service.sm.MouldPatchService;
import com.iformall.service.sm.MouldPatchSignService; import com.iformall.service.sm.MouldPatchSignService;
@@ -70,6 +67,7 @@ public class VoiceMouldController extends BaseController {
&& voiceMould.getParentId() == 0l && voiceMould.getCountSub() > 0){ && voiceMould.getParentId() == 0l && voiceMould.getCountSub() > 0){
VoiceMould voiceQ = new VoiceMould(); VoiceMould voiceQ = new VoiceMould();
voiceQ.setParentId(voiceMould.getId()); voiceQ.setParentId(voiceMould.getId());
voiceQ.setVoiceType(EnumVoiceType.speak.getCode());//目前只查询说话风格
voiceQ.setStatus(EnumaMouldPatchStatus.put_on.getCode()); voiceQ.setStatus(EnumaMouldPatchStatus.put_on.getCode());
voiceQ.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); voiceQ.setSortColumns(BaseEntity.SortField.UpdateDate_DESC);
List<VoiceMould> sublist = voiceMouldService.getClist(voiceQ); List<VoiceMould> sublist = voiceMouldService.getClist(voiceQ);


+ 1
- 1
suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java View File

@@ -136,7 +136,7 @@ public class VoiceMould extends TenantEntity {
private Integer personType; private Integer personType;
@TableField(exist = false) @TableField(exist = false)
private String personTypeStr; private String personTypeStr;
public String getPersonaTypeStr(){
public String getPersonTypeStr(){
EnumPersonType anEnum = EnumPersonType.getEnum(this.personType); EnumPersonType anEnum = EnumPersonType.getEnum(this.personType);
if(anEnum != null){ if(anEnum != null){
personTypeStr = anEnum.getMessage(); personTypeStr = anEnum.getMessage();


+ 1
- 1
suimangService/src/main/java/com/iformall/enums/EnumPersonType.java View File

@@ -14,7 +14,7 @@ public enum EnumPersonType {
* | default | 默认风格 | | 默认的语音风格,没做任何风格转换 * | default | 默认风格 | | 默认的语音风格,没做任何风格转换
*/ */


default_0(0, "默认风格","default"),
default_0(0, "默认","default"),
Boy(1, "男孩","Boy"), Boy(1, "男孩","Boy"),
Girl(2,"女孩","Girl"), Girl(2,"女孩","Girl"),
OlderAdultFemale(3,"女老年","OlderAdultFemale"), OlderAdultFemale(3,"女老年","OlderAdultFemale"),


+ 1
- 1
suimangService/src/main/java/com/iformall/enums/EnumSpeakType.java View File

@@ -41,7 +41,7 @@ public enum EnumSpeakType {
* | default | 默认风格 | | 默认的语音风格,没做任何风格转换 * | default | 默认风格 | | 默认的语音风格,没做任何风格转换
*/ */


default_0(0, "默认风格","default"),
default_0(0, "默认","default"),
advertisement_upbeat(1, "广告-欢快","advertisement-upbeat"), advertisement_upbeat(1, "广告-欢快","advertisement-upbeat"),
affectionate(2,"撒娇","affectionate"), affectionate(2,"撒娇","affectionate"),
angry(3,"愤怒","angry"), angry(3,"愤怒","angry"),


+ 4
- 0
suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java View File

@@ -118,14 +118,18 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId());
voiceMouldObject.put("personId",0l); voiceMouldObject.put("personId",0l);
voiceMouldObject.put("personType",0); voiceMouldObject.put("personType",0);
voiceMouldObject.put("personTypeStr","默认");
voiceMouldObject.put("speakId",0l); voiceMouldObject.put("speakId",0l);
voiceMouldObject.put("speakType",0); voiceMouldObject.put("speakType",0);
voiceMouldObject.put("speakTypeStr","默认");
if(EnumVoiceType.person.getCode().equals(voiceMould.getVoiceType())){ if(EnumVoiceType.person.getCode().equals(voiceMould.getVoiceType())){
voiceMouldObject.put("personId",voiceMould.getId()); voiceMouldObject.put("personId",voiceMould.getId());
voiceMouldObject.put("personType",voiceMould.getPersonType()); voiceMouldObject.put("personType",voiceMould.getPersonType());
voiceMouldObject.put("personTypeStr",voiceMould.getPersonTypeStr());
}else if(EnumVoiceType.speak.getCode().equals(voiceMould.getVoiceType())){ }else if(EnumVoiceType.speak.getCode().equals(voiceMould.getVoiceType())){
voiceMouldObject.put("speakId",voiceMould.getId()); voiceMouldObject.put("speakId",voiceMould.getId());
voiceMouldObject.put("speakType",voiceMould.getPersonType()); voiceMouldObject.put("speakType",voiceMould.getPersonType());
voiceMouldObject.put("speakTypeStr",voiceMould.getSpeakTypeStr());
} }
record.setVoiceMouldSm(voiceMouldObject.toJSONString()); record.setVoiceMouldSm(voiceMouldObject.toJSONString());
} }


Loading…
Cancel
Save