perf($Excel): keep field order by HashMap -> LinkedHashMap

johnnymillergh · Sep 27, 2021 · b7ee607 · b7ee607
1 parent 9cf7c4d
commit b7ee607
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/common/src/main/java/com/jmsoftware/maf/common/bean/PageResponseBodyBean.java b/common/src/main/java/com/jmsoftware/maf/common/bean/PageResponseBodyBean.java
@@ -3,6 +3,8 @@
 import cn.hutool.json.JSON;
 import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jmsoftware.maf.common.constant.UniversalDateTime;
 import com.jmsoftware.maf.common.exception.BaseException;
 import com.jmsoftware.maf.common.exception.BizException;
 import lombok.*;
@@ -38,6 +40,7 @@ public class PageResponseBodyBean<T> implements Serializable {
      * 23:08:46'
      */
     @Setter(AccessLevel.NONE)
+    @JsonFormat(pattern = UniversalDateTime.DATE_TIME_FORMAT)
     final LocalDateTime timestamp = LocalDateTime.now();
     /**
      * Default status is 200 OK.

diff --git a/common/src/main/java/com/jmsoftware/maf/common/bean/ResponseBodyBean.java b/common/src/main/java/com/jmsoftware/maf/common/bean/ResponseBodyBean.java
@@ -3,6 +3,7 @@
 import cn.hutool.json.JSON;
 import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jmsoftware.maf.common.constant.UniversalDateTime;
 import com.jmsoftware.maf.common.exception.BaseException;
 import com.jmsoftware.maf.common.exception.BizException;
@@ -35,6 +36,7 @@ public class ResponseBodyBean<T> implements Serializable {
      * 23:08:46'
      */
     @Setter(AccessLevel.NONE)
+    @JsonFormat(pattern = UniversalDateTime.DATE_TIME_FORMAT)
     private final LocalDateTime timestamp = LocalDateTime.now();
     /**
      * Default status is 200 OK.

diff --git a/...main/java/com/jmsoftware/maf/reactivespringcloudstarter/MafReactiveAutoConfiguration.java b/...main/java/com/jmsoftware/maf/reactivespringcloudstarter/MafReactiveAutoConfiguration.java
@@ -34,8 +34,7 @@
 @Import({
         RedisConfiguration.class,
         WebFluxConfiguration.class,
-        WebClientConfiguration.class,
-        JacksonConfiguration.class
+        WebClientConfiguration.class
 })
 public class MafReactiveAutoConfiguration {
     @PostConstruct

diff --git a/.../src/main/java/com/jmsoftware/maf/springcloudstarter/poi/AbstractExcelDataController.java b/.../src/main/java/com/jmsoftware/maf/springcloudstarter/poi/AbstractExcelDataController.java
@@ -107,7 +107,7 @@ public abstract class AbstractExcelDataController<T> {
      * Name</td><td>titleName</td></tr></tbody>
      * </table></figure>
      */
-    protected final Map<String, String> importingFieldAliasMap = Maps.newHashMap();
+    protected final Map<String, String> importingFieldAliasMap = Maps.newLinkedHashMap();
     /**
      * <figure><table>
      * <thead>
@@ -116,7 +116,7 @@ public abstract class AbstractExcelDataController<T> {
      * Name</td></tr></tbody>
      * </table></figure>
      */
-    protected final Map<String, String> exportingFieldAliasMap = Maps.newHashMap();
+    protected final Map<String, String> exportingFieldAliasMap = Maps.newLinkedHashMap();
 
     @Autowired
     protected ExcelImportConfiguration excelImportConfiguration;