Commit 8fca695f authored by alex yao's avatar alex yao

feat:Agent应用音色对系统环境语言匹配

parent d7c6c6c6
...@@ -35,7 +35,7 @@ public enum MatchLangEnum { ...@@ -35,7 +35,7 @@ public enum MatchLangEnum {
return matchLang; return matchLang;
} }
public String getMatchLangByLanguage(int language) { public static String getMatchLangByLanguage(int language) {
for (MatchLangEnum matchLang : MatchLangEnum.values()) { for (MatchLangEnum matchLang : MatchLangEnum.values()) {
if (matchLang.language == language) { if (matchLang.language == language) {
return matchLang.matchLang; return matchLang.matchLang;
......
...@@ -53,6 +53,7 @@ public class BizVoiceTimbreConvert { ...@@ -53,6 +53,7 @@ public class BizVoiceTimbreConvert {
public static GetTimbreDto entityToGetTimbreDto(BizVoiceTimbreEntity entity, Locale locale) { public static GetTimbreDto entityToGetTimbreDto(BizVoiceTimbreEntity entity, Locale locale) {
GetTimbreDto getTimbreDto = new GetTimbreDto(); GetTimbreDto getTimbreDto = new GetTimbreDto();
getTimbreDto.setLanguage(entity.getLanguage()); getTimbreDto.setLanguage(entity.getLanguage());
getTimbreDto.setMatchLang(MatchLangEnum.getMatchLangByLanguage(entity.getLanguage()));
TimbreInfo timbreInfo = setTimbreInfo(locale, entity); TimbreInfo timbreInfo = setTimbreInfo(locale, entity);
getTimbreDto.setTimbreInfo(ListUtil.toList(timbreInfo)); getTimbreDto.setTimbreInfo(ListUtil.toList(timbreInfo));
return getTimbreDto; return getTimbreDto;
......
package cn.com.poc.timbre.rest; package cn.com.poc.timbre.rest;
import cn.com.poc.common.utils.JsonUtils;
import cn.com.poc.timbre.dto.GetTimbreDto; import cn.com.poc.timbre.dto.GetTimbreDto;
import cn.com.poc.timbre.entity.BizVoiceTimbreEntity; import cn.com.poc.timbre.entity.BizVoiceTimbreEntity;
import cn.com.poc.timbre.rest.impl.BizVoiceTimbreRest; import cn.com.poc.timbre.rest.impl.BizVoiceTimbreRest;
import cn.com.poc.timbre.service.BizVoiceTimbreService; import cn.com.poc.timbre.service.BizVoiceTimbreService;
import cn.com.yict.framemax.core.context.Context; import cn.com.yict.framemax.core.context.Context;
import cn.com.yict.framemax.core.i18n.BundleMessageSourceImplementor; import cn.com.yict.framemax.core.i18n.BundleMessageSourceImplementor;
import cn.com.yict.framemax.core.spring.SingleContextInitializer;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.*; import org.mockito.*;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.web.WebAppConfiguration;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
...@@ -67,6 +65,7 @@ public class BizVoiceTimbreRestTest { ...@@ -67,6 +65,7 @@ public class BizVoiceTimbreRestTest {
public void getTimbreListTest() throws Exception { public void getTimbreListTest() throws Exception {
// When // When
List<GetTimbreDto> result = bizVoiceTimbreRest.getTimbreList(); List<GetTimbreDto> result = bizVoiceTimbreRest.getTimbreList();
System.out.println("getTimbreListTest:" + JsonUtils.serialize(result));
// Then // Then
assertEquals(3, result.size()); assertEquals(3, result.size());
} }
...@@ -75,6 +74,7 @@ public class BizVoiceTimbreRestTest { ...@@ -75,6 +74,7 @@ public class BizVoiceTimbreRestTest {
public void getTimbreInfo() { public void getTimbreInfo() {
GetTimbreDto timbreInfo = bizVoiceTimbreRest.getTimbreInfo("12341423AA"); GetTimbreDto timbreInfo = bizVoiceTimbreRest.getTimbreInfo("12341423AA");
assertNotNull(timbreInfo); assertNotNull(timbreInfo);
System.out.println("timbreInfo:" + JsonUtils.serialize(timbreInfo));
when(bizVoiceTimbreService.getByTimbreId(any())).thenReturn(isNull()); when(bizVoiceTimbreService.getByTimbreId(any())).thenReturn(isNull());
timbreInfo = bizVoiceTimbreRest.getTimbreInfo("12341423AA"); timbreInfo = bizVoiceTimbreRest.getTimbreInfo("12341423AA");
...@@ -82,7 +82,7 @@ public class BizVoiceTimbreRestTest { ...@@ -82,7 +82,7 @@ public class BizVoiceTimbreRestTest {
} }
@After @After
public void close(){ public void close() {
mockedContext.close(); mockedContext.close();
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment