Merge remote-tracking branch 'origin/develop_master' into develop_master

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){
+    public RestTemplate restTemplate(RestTemplateBuilder builder){
-        RestTemplate restTemplate = new RestTemplate(factory);
+        return builder.build();
-        // 使用 utf-8 编码集的 conver 替换默认的 conver（默认的 string conver 的编码集为"ISO-8859-1"）
-        List<HttpMessageConverter<?>> messageConverters = restTemplate.getMessageConverters();
-        Iterator<HttpMessageConverter<?>> 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;
     }
 
     @Bean

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java

@@ -117,6 +117,9 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
                     list1.set(a,fileNameDto);
                 }else if (null!=list.get(a).getFileIds()){
                     AttFileEO attFileEO = attFileEOController.getAttFileInfo(list.get(a).getFileIds()).getData();
+                    FindFileNameDto fileNameDto = list1.get(a);
+                    fileNameDto.setFileName(attFileEO.getOldFileName());
+                    list1.set(a,fileNameDto);
                 }
             }
             IPage<FindFileNameDto> publicList = new Page<>();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java

@@ -91,8 +91,12 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
             else if (addDetailedDto.getCarType() != null) {
                 //就判断页面的值和数据库里的值是否相等
                 for (int i = 0; i < sarLawsDetailedLists.size(); i++) {
+                    //判断数据库里的数据的车型类别字段是否为空
+                    if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCarType()){
+                        System.out.println("数据库里第" + (i + 1) + "条的车型类别字段长度为空，不重复，目前可以添加");
+                    }
                     //相等就不许添加
-                    if (Objects.equals(addDetailedDto.getCarType(), sarLawsDetailedLists.get(i).getCarType())) {
+                    else if (Objects.equals(addDetailedDto.getCarType(), sarLawsDetailedLists.get(i).getCarType())) {
                         System.out.println("数据库里第" + (i + 1) + "条的车型类别字段和页面一样，重复，不许添加");
                         carAddFlag = false;
                     }
@@ -205,7 +209,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                     .sortKey(addDetailedDto.getSortKey())
                     .detailedListName(addDetailedDto.getDetailedListName())
                     .detailedListState("0")
-                    .detailedListVision("v0")
                     .applicationScope(addDetailedDto.getApplicationScope())
                     .updateTime(new Date())
                     .updatePeople(addDetailedDto.getUpdatePeople())
@@ -317,7 +320,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                             }
                         }
                     }
-                    String completedString = builder.delete(builder.length() - 1, builder.length()).toString();
+                    String completedString = "";
+                    if (builder.length()>0) {
+                        completedString = builder.delete(builder.length() - 1, builder.length()).toString();
+                    }
                     list1.setCountryArea(completedString);
                 } else {
                     for (Map<String, String> map1 : arr) {
@@ -337,10 +343,14 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
 
     @Override
     public String updateList(DetailedUpDto detailedUpDto) {
+        //list是数据库里根据id查出来的数据;detailedUpDto是页面传回来的数据
         SarLawsDetailedList list = sarLawsDetailedListDao.selectById(detailedUpDto.getId());
+
         //国家或地区
+        //如果页面的国家地区为空，就把数据库里的国家地区字段也设为空
         if (StringUtils.isBlank(detailedUpDto.getCountryArea())) list.setCountryArea(null);
         else if ("null".equals(detailedUpDto.getCountryArea())) ;
+        //把数据库里的国家地区字段设为页面的国家地区
         else list.setCountryArea(detailedUpDto.getCountryArea());
         //车型类别
         if (StringUtils.isBlank(detailedUpDto.getCarType())) list.setCarType(null);

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;
 }

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";
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java

@@ -40,11 +40,11 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
 
     @Override
     public IPage<SarPublicIdeaAllSUD> 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<SarPublicIdeaAllDao
         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();
         }