Bläddra i källkod

//..

private_deployment
xhxu 1 år sedan
förälder
incheckning
62d1a024c5
4 ändrade filer med 12 tillägg och 12 borttagningar
  1. +1
    -1
      suimangService/src/main/java/com/iformall/domain/po/sm/PhotoSpeakVideo.java
  2. +2
    -2
      suimangService/src/main/java/com/iformall/enums/EnumSpeakType.java
  3. +5
    -5
      suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java
  4. +4
    -4
      suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java

+ 1
- 1
suimangService/src/main/java/com/iformall/domain/po/sm/PhotoSpeakVideo.java Visa fil

@@ -81,7 +81,7 @@ public class PhotoSpeakVideo extends TenantEntity {
private VoiceInfo voiceInfo;

public String getSpeakTypeStr(){
if(StringUtils.isNotBlank(this.voiceMouldSm)){
if(StringUtils.isBlank(this.speakTypeStr) && StringUtils.isNotBlank(this.voiceMouldSm)){
try{
JSONObject personMouldObject = JSONObject.parseObject(this.voiceMouldSm);
Integer speakType = personMouldObject.getInteger("speakType");


+ 2
- 2
suimangService/src/main/java/com/iformall/enums/EnumSpeakType.java Visa fil

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

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


+ 5
- 5
suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java Visa fil

@@ -116,15 +116,15 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
if(voiceMould == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到声音模板信息");
}
record.setVoiceMouldSm(null);
JSONObject voiceMouldObject = new JSONObject();
voiceMouldObject.put("title",voiceMould.getLocalName());
voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId());
voiceMouldObject.put("sex",voiceMould.getSex());
voiceMouldObject.put("personType",0);
voiceMouldObject.put("personTypeStr","default");
voiceMouldObject.put("personTypeStr","默认");
voiceMouldObject.put("speakType",0);
voiceMouldObject.put("speakTypeStr","default");
voiceMouldObject.put("speakTypeStr","默认");
EnumSpeakType speakType = null;
if(StringUtils.isNotBlank(record.getSpeakTypeStr())){
speakType = EnumSpeakType.getEnumByMsg(record.getSpeakTypeStr());
@@ -244,9 +244,9 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
Integer personType = personMouldObject.getInteger("personType");
sex = personMouldObject.getInteger("sex");
if(speakType != null && speakType > 0){
voiceType = EnumSpeakType.getEnum(speakType).getMessage();
voiceType = EnumSpeakType.getEnum(speakType).getType();
}else if(personType != null && personType > 0){
voiceType = EnumPersonType.getEnum(personType).getMessage();
voiceType = EnumPersonType.getEnum(personType).getType();
}

}catch(Exception e){}


+ 4
- 4
suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java Visa fil

@@ -160,9 +160,9 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
voiceMouldObject.put("title",voiceMould.getTitle());
voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId());
voiceMouldObject.put("personType",0);
voiceMouldObject.put("personTypeStr","default");
voiceMouldObject.put("personTypeStr","默认");
voiceMouldObject.put("speakType",0);
voiceMouldObject.put("speakTypeStr","default");
voiceMouldObject.put("speakTypeStr","默认");
if(EnumVoiceType.person.getCode().equals(voiceMould.getVoiceType())){
voiceMouldObject.put("personType",voiceMould.getPersonType());
voiceMouldObject.put("personTypeStr",voiceMould.getPersonTypeStr());
@@ -269,9 +269,9 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
Integer speakType = personMouldObject.getInteger("speakType");
Integer personType = personMouldObject.getInteger("personType");
if(speakType != null && speakType > 0){
voiceType = EnumSpeakType.getEnum(speakType).getMessage();
voiceType = EnumSpeakType.getEnum(speakType).getType();
}else if(personType != null && personType > 0){
voiceType = EnumPersonType.getEnum(personType).getMessage();
voiceType = EnumPersonType.getEnum(personType).getType();
}

}catch(Exception e){}


Laddar…
Avbryt
Spara