From d8386b83ea0ab5f61dfe6aeac8e4344aa89c4c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Tue, 2 Jul 2024 10:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E9=80=9A=E6=B5=81=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DcTrafficFlowWarning.java        | 17 +++++++----------
 .../java/com/zc/business/domain/DcEvent.java    |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTrafficFlowWarning.java b/zc-business/src/main/java/com/zc/business/controller/DcTrafficFlowWarning.java
index 577a4509..b15cc53a 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcTrafficFlowWarning.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcTrafficFlowWarning.java
@@ -17,10 +17,7 @@ import javax.annotation.Resource;
 import java.text.ParseException;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  *
@@ -56,7 +53,7 @@ public class DcTrafficFlowWarning {
         DateTimeFormatter formatterStr = DateTimeFormatter.ofPattern(UniversalEnum.PURE_CHINESE_CHARACTER_TIME_FORMATS_YEARS_MONTH_DAY.getValue());
       String formattedDate = dateAfterSevenDays.format(formatter);
         String formattedDateStr = dateAfterSevenDays.format(formatterStr);
-     //     String formattedDate ="2024-05-01";
+        // String formattedDate ="2024-05-01";
 
         for (DcHolidays holidays : dcHolidaysList) {
             String vacation = holidays.getVacation();
@@ -72,12 +69,12 @@ public class DcTrafficFlowWarning {
 
 
                 String[] date = vacation1.split(UniversalEnum.THERE_S_A_LOT_GOING_ON.getValue());
-                Map<String, Map<String, List<Map<String, String>>>> mapListOne = new HashMap<>();
+                Map<String, Map<String, List<Map<String, String>>>> mapListOne = new LinkedHashMap<>();
 
-                Map<String, List<Map<String, String>>> map = new HashMap<>();
-                Map<String, List<Map<String, String>>> map2 = new HashMap<>();
-                Map<String, List<Map<String, String>>> map3 = new HashMap<>();
-                Map<String, List<Map<String, String>>> map4 = new HashMap<>();
+                Map<String, List<Map<String, String>>> map = new LinkedHashMap<>();
+                Map<String, List<Map<String, String>>> map2 = new LinkedHashMap<>();
+                Map<String, List<Map<String, String>>> map3 = new LinkedHashMap<>();
+                Map<String, List<Map<String, String>>> map4 = new LinkedHashMap<>();
                 for (int i1 = UniversalEnum.ZERO.getNumber(); i1 < date.length; i1++) {
                     //交通流
                     List<Map<String, String>> mapList = dcGantryStatisticsDataService.realTimeTrafficFlow(date[i1], UniversalEnum.ONE.getValue(), UniversalEnum.FOUR.getValue());
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
index b251bbe9..eef30096 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcEvent.java
@@ -189,7 +189,7 @@ public class DcEvent {
      * 2-关联事件
      */
     @ApiModelProperty("事件性质      * 1-首发事件* 2-关联事件")
-    @Excel(name = "事件性质")
+    @Excel(name = "事件性质", readConverterExp = "1=首发事件,2=关联事件" )
     private Long eventNature;
 
     /**