diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java index 8b91a64b..795933c3 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java +++ b/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java @@ -2,6 +2,7 @@ package com.adc.da.main.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -26,20 +27,8 @@ public class RestTemplateConfig { @Bean @LoadBalanced - public RestTemplate restTemplate(ClientHttpRequestFactory factory){ - RestTemplate restTemplate = new RestTemplate(factory); - // 使用 utf-8 编码集的 conver 替换默认的 conver(默认的 string conver 的编码集为"ISO-8859-1") - List> messageConverters = restTemplate.getMessageConverters(); - Iterator> iterator = messageConverters.iterator(); - while (iterator.hasNext()) { - HttpMessageConverter converter = iterator.next(); - if (converter instanceof StringHttpMessageConverter) { - iterator.remove(); - } - } - messageConverters.add(new StringHttpMessageConverter(Charset.forName("UTF-8"))); - - return restTemplate; + public RestTemplate restTemplate(RestTemplateBuilder builder){ + return builder.build(); } @Bean diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index a9626011..73312878 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -118,6 +118,9 @@ public class SarLawsDetailedListController extends BaseController publicList = new Page<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 510b848d..f8e884fb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -320,7 +320,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl0) { + completedString = builder.delete(builder.length() - 1, builder.length()).toString(); + } list1.setCountryArea(completedString); } else { for (Map map1 : arr) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java index a1e195cf..e0da9d35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java @@ -8,6 +8,6 @@ public class DetAllStandDto { Integer size; String cid; String userId; - String startTime; + String endTime; String Account; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index d2bc72eb..54e7ba1c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java @@ -49,6 +49,15 @@ public class SarPublicIdeaAll extends BaseEntity { @TableField("dept_name") private String deptName; + @TableField("reason") + private String reason; + + @TableField("old_text") + private String oldText; + + @TableField("new_text") + private String newText; + public static final String CID = "cid"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 6d17d6f7..7f34cc6c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -40,11 +40,11 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl selectAll(DetAllStandDto detAllStandDto) { - if (detAllStandDto.getStartTime() != null) { + if (detAllStandDto.getEndTime() != null) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date Time = null; try { - Time = sdf.parse(detAllStandDto.getStartTime()); + Time = sdf.parse(detAllStandDto.getEndTime()); } catch (ParseException e) { e.printStackTrace(); } @@ -110,7 +110,7 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl