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

zc-business/src/main/java/com/zc/business/controller/WordController.java

@@ -171,12 +171,15 @@ public class WordController {
                 DateTimeFormatter parseFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
 
                 data.forEach(dataItem ->{
-                    if (UniversalEnum.STAKE_NUM_K60.getValue().equals(dataItem.get("stakeNum"))){
-                        setTableFonts(table.getRow(UniversalEnum.ONE.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), UniversalEnum.CHANG_QING_DISTRICT.getValue());
                     List<Map<String,Object>> weatherList = (List<Map<String,Object>>) dataItem.get("forecastList");
+                    if (weatherList != null && weatherList.size() > 0){
                         weatherList = weatherList.stream()
                                 .sorted(Comparator.comparing(map -> LocalDateTime.parse(map.get("weatherTime").toString(), parseFormatter)))
                                 .collect(Collectors.toList());
+
+                        if (UniversalEnum.STAKE_NUM_K60.getValue().equals(dataItem.get("stakeNum"))){
+                            setTableFonts(table.getRow(UniversalEnum.ONE.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), UniversalEnum.CHANG_QING_DISTRICT.getValue());
+
                             for (int i = UniversalEnum.ZERO.getNumber(); i < weatherList.size(); i++) {
                                 //第一行 格式化时间
                                 LocalDateTime localDateTime = LocalDateTime.parse(weatherList.get(i).get("weatherTime").toString(), parseFormatter);
@@ -186,68 +189,41 @@ public class WordController {
                             }
                         } else if (UniversalEnum.STAKE_NUM_K105.getValue().equals(dataItem.get("stakeNum"))){
                             setTableFonts(table.getRow(UniversalEnum.TWO.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), UniversalEnum.PING_YIN_COUNTY.getValue());
-                        List<Map<String,Object>> weatherList = (List<Map<String,Object>>) dataItem.get("forecastList");
-                        weatherList = weatherList.stream()
-                                .sorted(Comparator.comparing(map -> LocalDateTime.parse(map.get("weatherTime").toString(), parseFormatter)))
-                                .collect(Collectors.toList());
                             for (int i = UniversalEnum.ZERO.getNumber(); i < weatherList.size(); i++) {
                                 setTableFonts(table.getRow(UniversalEnum.TWO.getNumber()).getCell(i+UniversalEnum.ONE.getNumber()), weatherList.get(i).get("weatherDescription").toString());
                             }
                         } else if (UniversalEnum.STAKE_NUM_K145.getValue().equals(dataItem.get("stakeNum"))){
                             setTableFonts(table.getRow(UniversalEnum.THREE.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), UniversalEnum.DONG_PING_COUNTY.getValue());
-                        List<Map<String,Object>> weatherList = (List<Map<String,Object>>) dataItem.get("forecastList");
-                        weatherList = weatherList.stream()
-                                .sorted(Comparator.comparing(map -> LocalDateTime.parse(map.get("weatherTime").toString(), parseFormatter)))
-                                .collect(Collectors.toList());
                             for (int i = UniversalEnum.ZERO.getNumber(); i < weatherList.size(); i++) {
                                 setTableFonts(table.getRow(UniversalEnum.THREE.getNumber()).getCell(i+UniversalEnum.ONE.getNumber()), weatherList.get(i).get("weatherDescription").toString());
                             }
                         } else if (UniversalEnum.STAKE_NUM_K165.getValue().equals(dataItem.get("stakeNum"))){
                             setTableFonts(table.getRow(UniversalEnum.FOUR.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), UniversalEnum.WEN_SHANG_COUNTY.getValue());
-                        List<Map<String,Object>> weatherList = (List<Map<String,Object>>) dataItem.get("forecastList");
-                        weatherList = weatherList.stream()
-                                .sorted(Comparator.comparing(map -> LocalDateTime.parse(map.get("weatherTime").toString(), parseFormatter)))
-                                .collect(Collectors.toList());
                             for (int i = UniversalEnum.ZERO.getNumber(); i < weatherList.size(); i++) {
                                 setTableFonts(table.getRow(UniversalEnum.FOUR.getNumber()).getCell(i+UniversalEnum.ONE.getNumber()), weatherList.get(i).get("weatherDescription").toString());
                             }
                         } else if (UniversalEnum.STAKE_NUM_K175.getValue().equals(dataItem.get("stakeNum"))){
                             setTableFonts(table.getRow(UniversalEnum.FIVE.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), UniversalEnum.LIANG_SHAN_COUNTY.getValue());
-                        List<Map<String,Object>> weatherList = (List<Map<String,Object>>) dataItem.get("forecastList");
-                        weatherList = weatherList.stream()
-                                .sorted(Comparator.comparing(map -> LocalDateTime.parse(map.get("weatherTime").toString(), parseFormatter)))
-                                .collect(Collectors.toList());
                             for (int i = UniversalEnum.ZERO.getNumber(); i < weatherList.size(); i++) {
                                 setTableFonts(table.getRow(UniversalEnum.FIVE.getNumber()).getCell(i+UniversalEnum.ONE.getNumber()), weatherList.get(i).get("weatherDescription").toString());
                             }
                         } else if (UniversalEnum.STAKE_NUM_K190.getValue().equals(dataItem.get("stakeNum"))){
                             setTableFonts(table.getRow(UniversalEnum.SIX.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), UniversalEnum.JIA_XIANG_COUNTY.getValue());
-                        List<Map<String,Object>> weatherList = (List<Map<String,Object>>) dataItem.get("forecastList");
-                        weatherList = weatherList.stream()
-                                .sorted(Comparator.comparing(map -> LocalDateTime.parse(map.get("weatherTime").toString(), parseFormatter)))
-                                .collect(Collectors.toList());
                             for (int i = UniversalEnum.ZERO.getNumber(); i < weatherList.size(); i++) {
                                 setTableFonts(table.getRow(UniversalEnum.SIX.getNumber()).getCell(i+UniversalEnum.ONE.getNumber()), weatherList.get(i).get("weatherDescription").toString());
                             }
                         } else if (UniversalEnum.STAKE_NUM_K200.getValue().equals(dataItem.get("stakeNum"))){
                             setTableFonts(table.getRow(UniversalEnum.SEVEN.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), UniversalEnum.JUYE_COUNTY.getValue());
-                        List<Map<String,Object>> weatherList = (List<Map<String,Object>>) dataItem.get("forecastList");
-                        weatherList = weatherList.stream()
-                                .sorted(Comparator.comparing(map -> LocalDateTime.parse(map.get("weatherTime").toString(), parseFormatter)))
-                                .collect(Collectors.toList());
                             for (int i = UniversalEnum.ZERO.getNumber(); i < weatherList.size(); i++) {
                                 setTableFonts(table.getRow(UniversalEnum.SEVEN.getNumber()).getCell(i+UniversalEnum.ONE.getNumber()), weatherList.get(i).get("weatherDescription").toString());
                             }
                         } else if (UniversalEnum.STAKE_NUM_K205.getValue().equals(dataItem.get("stakeNum"))){
                             setTableFonts(table.getRow(UniversalEnum.EIGHT.getNumber()).getCell(UniversalEnum.ZERO.getNumber()), UniversalEnum.YUN_CHENG_COUNTY.getValue());
-                        List<Map<String,Object>> weatherList = (List<Map<String,Object>>) dataItem.get("forecastList");
-                        weatherList = weatherList.stream()
-                                .sorted(Comparator.comparing(map -> LocalDateTime.parse(map.get("weatherTime").toString(), parseFormatter)))
-                                .collect(Collectors.toList());
                             for (int i = UniversalEnum.ZERO.getNumber(); i < weatherList.size(); i++) {
                                 setTableFonts(table.getRow(UniversalEnum.EIGHT.getNumber()).getCell(i+UniversalEnum.ONE.getNumber()), weatherList.get(i).get("weatherDescription").toString());
                             }
                         }
+                    }
                 });
             } else {
                 addDescription(doc,UniversalEnum.NO_DATA_AVAILABLE.getValue());