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 98b34c76..4c263614 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,16 +1,20 @@ package com.gzzn.omms.msgexchangeapi.basicdata.service; -import java.util.LinkedHashMap; +import java.util.ArrayList; import java.util.List; +import org.apache.lucene.analysis.ar.ArabicAnalyzer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; 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; @@ -28,19 +32,16 @@ public class OrmsStandServiceImpl implements IOrmsStandService{ @Override public List findAll() { - ResponseEntity responseEntity = restTemplate - .getForEntity( - ormsStandsUrl, - ResponseDto.class); - ResponseDto responseDto = responseEntity.getBody(); + ResponseEntity>> responseEntity = restTemplate + .exchange(ormsStandsUrl, + HttpMethod.GET, + null, + new ParameterizedTypeReference>>() { + }); + + ResponseDto> responseDto = responseEntity.getBody(); if (responseDto.getIs_success()) { - List lsLinked = (List)responseDto.getBody(); - - // - ObjectMapper mapper = new ObjectMapper(); - List rt = mapper.convertValue(lsLinked, new TypeReference>() { }); - - return rt; + return responseDto.getBody(); } else { throw new RuntimeException("未知错误"+responseDto.getErr_msg()); diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/config/RestTemplateConfig.java b/src/main/java/com/gzzn/omms/msgexchangeapi/config/RestTemplateConfig.java index fae99d4e..3f737aa3 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/config/RestTemplateConfig.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/config/RestTemplateConfig.java @@ -1,10 +1,13 @@ package com.gzzn.omms.msgexchangeapi.config; +import java.util.Arrays; + import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.SimpleClientHttpRequestFactory; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.client.RestTemplate; @Configuration @@ -12,7 +15,10 @@ public class RestTemplateConfig { @Bean @LoadBalanced public RestTemplate restTemplate(ClientHttpRequestFactory factory){ - return new RestTemplate(factory); + RestTemplate rest = new RestTemplate(factory); + rest.setMessageConverters(Arrays.asList(new MappingJackson2HttpMessageConverter())); + + return rest; } @Bean diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 3af06709..097a7c2d 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -87,7 +87,8 @@ elasticsearch: pool: 5 #注意cluster.name需要与config/elasticsearch.yml中的cluster.name一致 cluster: - name: docker-cluster + name: docker-cluster + nodes: 130.120.3.234:9300,130.120.3.236:9300,130.120.3.238:9300 eureka: client: service-url: diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/config/TestRestTemplateConfig.java b/src/test/java/com/gzzn/omms/msgexchangeapi/config/TestRestTemplateConfig.java index 4ccb912d..5fd1d30b 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/config/TestRestTemplateConfig.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/config/TestRestTemplateConfig.java @@ -1,16 +1,22 @@ package com.gzzn.omms.msgexchangeapi.config; +import java.util.Arrays; + 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.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.client.RestTemplate; @TestConfiguration public class TestRestTemplateConfig { @Bean public RestTemplate restTemplate(ClientHttpRequestFactory factory){ - return new RestTemplate(factory); + RestTemplate rest = new RestTemplate(factory); + rest.setMessageConverters(Arrays.asList(new MappingJackson2HttpMessageConverter())); + + return rest; } @Bean