From e345f2854d42493955e994aac3e9ce44ce048ef3 Mon Sep 17 00:00:00 2001 From: zhouxiunai <154707516@qq.com> Date: Tue, 19 Feb 2019 14:23:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8Eresttemplat?= =?UTF-8?q?e=E8=BF=94=E5=9B=9E=E7=9A=84list=E5=85=83=E7=B4=A0=E4=B8=BAlink?= =?UTF-8?q?edhashmap=E5=AF=BC=E8=87=B4=E7=9A=84=E8=8E=B7=E5=8F=96=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/OrmsStandServiceImpl.java | 11 +++++++- .../msghandler/flop/PSDTHandler.java | 3 ++- .../basicdata/OrmsStandManagerTest.java | 25 +++++++++++++++++++ .../basicdata/OrmsStandServiceImplTest.java | 6 ++++- .../config/TestRestTemplateConfig.java | 23 +++++++++++++++++ 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 src/test/java/com/gzzn/omms/msgexchangeapi/basicdata/OrmsStandManagerTest.java create mode 100644 src/test/java/com/gzzn/omms/msgexchangeapi/config/TestRestTemplateConfig.java diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/basicdata/service/OrmsStandServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/basicdata/service/OrmsStandServiceImpl.java index 1d95b440..585f01c9 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/basicdata/service/OrmsStandServiceImpl.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/basicdata/service/OrmsStandServiceImpl.java @@ -1,5 +1,7 @@ package com.gzzn.omms.msgexchangeapi.basicdata.service; +import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -8,6 +10,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import com.gzzn.omms.msgexchangeapi.basicdata.entity.OrmsStand; import com.gzzn.omms.msgexchangeapi.dto.ResponseDto; @@ -29,7 +33,12 @@ public class OrmsStandServiceImpl implements IOrmsStandService{ ResponseDto responseDto = responseEntity.getBody(); if (responseDto.getIs_success()) { - List rt = (List)responseDto.getBody(); + List lsLinked = (List)responseDto.getBody(); + + // + ObjectMapper mapper = new ObjectMapper(); + List rt = mapper.convertValue(lsLinked, new TypeReference>() { }); + return rt; } else { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandler.java index 0973149c..f2bbdc7b 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandler.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandler.java @@ -54,7 +54,7 @@ public class PSDTHandler extends FlopBaseHandler { fltr.getPSDT().add(standata); - //如果是近机位 + //获取机位 OrmsStand ormsStand = OrmsStandManager .getInstance() .getOrmsStandByStandCode(standata.getPSST()); @@ -64,6 +64,7 @@ public class PSDTHandler extends FlopBaseHandler { continue; } + //获取机位对应的登机桥 if("near".equalsIgnoreCase(ormsStand.getStandType())) { String abdg = fltr.getAbdg() + "," + standata.getPSST();//登机桥 diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/basicdata/OrmsStandManagerTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/basicdata/OrmsStandManagerTest.java new file mode 100644 index 00000000..d3f813f6 --- /dev/null +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/basicdata/OrmsStandManagerTest.java @@ -0,0 +1,25 @@ +package com.gzzn.omms.msgexchangeapi.basicdata; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import com.gzzn.omms.msgexchangeapi.basicdata.entity.OrmsStand; +import com.gzzn.omms.msgexchangeapi.basicdata.manager.OrmsStandManager; +import com.gzzn.omms.msgexchangeapi.config.TestRestTemplateConfig; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes=TestRestTemplateConfig.class) +public class OrmsStandManagerTest { + + @Test + public void testFindAll() + { + OrmsStand ormsStand = OrmsStandManager.getInstance().getOrmsStandByStandCode("140"); + assertThat(ormsStand).isNotNull(); + } + +} diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/basicdata/OrmsStandServiceImplTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/basicdata/OrmsStandServiceImplTest.java index 3236f584..98a2710e 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/basicdata/OrmsStandServiceImplTest.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/basicdata/OrmsStandServiceImplTest.java @@ -12,9 +12,10 @@ import org.springframework.test.context.junit4.SpringRunner; import com.gzzn.omms.msgexchangeapi.basicdata.entity.OrmsStand; import com.gzzn.omms.msgexchangeapi.basicdata.service.IOrmsStandService; +import com.gzzn.omms.msgexchangeapi.config.TestRestTemplateConfig; @RunWith(SpringRunner.class) -@SpringBootTest +@SpringBootTest(classes=TestRestTemplateConfig.class) public class OrmsStandServiceImplTest { @Autowired @@ -26,4 +27,7 @@ public class OrmsStandServiceImplTest { List lsOrmsStands = ormsStandService.findAll(); assertThat(lsOrmsStands).isNotEmpty(); } + + + } diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/config/TestRestTemplateConfig.java b/src/test/java/com/gzzn/omms/msgexchangeapi/config/TestRestTemplateConfig.java new file mode 100644 index 00000000..4ccb912d --- /dev/null +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/config/TestRestTemplateConfig.java @@ -0,0 +1,23 @@ +package com.gzzn.omms.msgexchangeapi.config; + +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.http.client.ClientHttpRequestFactory; +import org.springframework.http.client.SimpleClientHttpRequestFactory; +import org.springframework.web.client.RestTemplate; + +@TestConfiguration +public class TestRestTemplateConfig { + @Bean + public RestTemplate restTemplate(ClientHttpRequestFactory factory){ + return new RestTemplate(factory); + } + + @Bean + public ClientHttpRequestFactory simpleClientHttpRequestFactory(){ + SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); + factory.setReadTimeout(5000);//单位为ms + factory.setConnectTimeout(5000);//单位为ms + return factory; + } +}