Kaynağa Gözat

//..

private_deployment
xhxu 1 yıl önce
ebeveyn
işleme
b699a71d70
4 değiştirilmiş dosya ile 25 ekleme ve 28 silme
  1. +5
    -2
      suimangService/src/main/java/com/iformall/domain/po/sm/PhotoSpeakVideo.java
  2. +9
    -0
      suimangService/src/main/java/com/iformall/enums/EnumSpeakType.java
  3. +10
    -25
      suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java
  4. +1
    -1
      suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java

+ 5
- 2
suimangService/src/main/java/com/iformall/domain/po/sm/PhotoSpeakVideo.java Dosyayı Görüntüle

@@ -51,10 +51,13 @@ public class PhotoSpeakVideo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="EnumVoiceFrom 声音来源",name="voiceFrom")
private Integer voiceFrom;

@TableField(exist = false)
private List<Long> voiceMouldIds;
// @TableField(exist = false)
// private List<Long> voiceMouldIds;
@io.swagger.annotations.ApiModelProperty(value="声音模板ID",name="voiceMouldId")
private Long voiceMouldId;

@TableField(exist = false)
private String speakTypeStr;
/**
* {
* "title":,


+ 9
- 0
suimangService/src/main/java/com/iformall/enums/EnumSpeakType.java Dosyayı Görüntüle

@@ -87,6 +87,15 @@ public enum EnumSpeakType {
return null;
}

public static EnumSpeakType getEnum(String message) {
for (EnumSpeakType value : values()) {
if (value.getMessage().equals(message)) {
return value;
}
}
return null;
}

private EnumSpeakType(Integer code, String message, String type) {
this.code = code;
this.message = message;


+ 10
- 25
suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java Dosyayı Görüntüle

@@ -83,43 +83,28 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
}
if(record.getVoiceFrom() != null){
if(EnumVoiceFrom.FROM_MOULD.getCode().equals(record.getVoiceFrom())){
if(record.getVoiceMouldIds() == null || record.getVoiceMouldIds().isEmpty()){
if(record.getVoiceMouldId() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未选择声音模板信息");
}
if(record.getVoiceMouldIds().size() > 1){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"暂不支持声音模板交叉选择");
}
Long voiceMouldId = record.getVoiceMouldIds().get(0);
if(voiceMouldId == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未选择声音模板信息");
}
VoiceMould voiceMould = voiceMouldService.getById(voiceMouldId);
VoiceMould voiceMould = voiceMouldService.getById(record.getVoiceMouldId());
if(voiceMould == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到声音模板信息");
}
if(voiceMould.getParentId().equals(0L)){
record.setVoiceMouldId(voiceMould.getId());
}else{
record.setVoiceMouldId(voiceMould.getParentId());
}

JSONObject voiceMouldObject = new JSONObject();
voiceMouldObject.put("title",voiceMould.getTitle());
voiceMouldObject.put("languages",voiceMould.getLanguages());
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());
if(StringUtils.isNotBlank(record.getSpeakTypeStr())){
EnumSpeakType speakType = EnumSpeakType.getEnum(record.getSpeakTypeStr());
if(speakType == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到声音类型信息");
}
voiceMouldObject.put("speakType",speakType.getCode());
voiceMouldObject.put("speakTypeStr",speakType.getMessage());
}
record.setVoiceMouldSm(voiceMouldObject.toJSONString());
}else if(EnumVoiceFrom.FROM_UPD.getCode().equals(record.getVoiceFrom())){


+ 1
- 1
suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java Dosyayı Görüntüle

@@ -167,7 +167,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
voiceMouldObject.put("personType",voiceMould.getPersonType());
voiceMouldObject.put("personTypeStr",voiceMould.getPersonTypeStr());
}else if(EnumVoiceType.speak.getCode().equals(voiceMould.getVoiceType())){
voiceMouldObject.put("speakType",voiceMould.getPersonType());
voiceMouldObject.put("speakType",voiceMould.getSpeakType());
voiceMouldObject.put("speakTypeStr",voiceMould.getSpeakTypeStr());
}
record.setVoiceMouldSm(voiceMouldObject.toJSONString());


Yükleniyor…
İptal
Kaydet