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

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

@@ -1,8 +1,11 @@
 package com.zc.business.controller;
 
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -62,6 +65,21 @@ public class DcBoardReleaseLogController extends BaseController
     public void export(HttpServletResponse response, DcBoardReleaseLog dcBoardReleaseLog)
     {
         List<DcBoardReleaseLog> list = dcBoardReleaseLogService.selectDcBoardReleaseLogList(dcBoardReleaseLog);
+        for (DcBoardReleaseLog releaseLog : list) {
+            String content = releaseLog.getReleaseContent();
+            List<Map<String,Object>> contentList = JSONArray.parseObject(content,List.class);
+            if (contentList != null){
+                StringBuilder contentText = new StringBuilder();
+                for (int i = 0; i < contentList.size(); i++) {
+                    String contentItem = contentList.get(i+1).get("CONTENT").toString().replace("\\\\n"," ");
+                    contentText.append(i).append(".").append(contentItem).append("\n");
+                }
+                releaseLog.setReleaseContent(contentText.toString());
+            } else {
+                releaseLog.setReleaseContent("");
+            }
+
+        }
         ExcelUtil<DcBoardReleaseLog> util = new ExcelUtil<>(DcBoardReleaseLog.class);
         util.exportExcel(response, list, "情报板内容发布日志数据");
     }

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

@@ -128,68 +128,75 @@ public class WordController {
 
         PoiUtil.createHeading2(doc,"天气情况统计");
 
-        XWPFTable table = doc.createTable(9, 25);
-        //列宽自动分割
-        CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW();
-        infoTableWidth.setType(STTblWidth.DXA);
-        infoTableWidth.setW(BigInteger.valueOf(9072));
-
         AjaxResult ajaxResult = weatherForecastController.hourlyWeather();
         if (ajaxResult.get("code").equals(200)) {
+
             Map<String,List<Map<String,Object>>> data = (Map<String, List<Map<String,Object>>>) ajaxResult.get("data");
-            data.keySet().forEach(key ->{
+            if (data != null && data.size() != 0){
-                if ("hourlyWeather1".equals(key)){
+
-                    setTableFonts(table.getRow(1).getCell(0), "长清区");
+                XWPFTable table = doc.createTable(9, 25);
-                    List<Map<String,Object>> weatherList = data.get(key);
+                //列宽自动分割
-                    for (int i = 0; i < weatherList.size(); i++) {
+                CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW();
-                        OffsetDateTime offsetDateTime = OffsetDateTime.parse(weatherList.get(i).get("fxTime").toString());
+                infoTableWidth.setType(STTblWidth.DXA);
-                        setTableFonts(table.getRow(0).getCell(i+1),offsetDateTime.format(DateTimeFormatter.ofPattern("dd日HH时")));
+                infoTableWidth.setW(BigInteger.valueOf(9072));
-                        setTableFonts(table.getRow(1).getCell(i+1), weatherList.get(i).get("text").toString());
+
-                    }
+                data.keySet().forEach(key ->{
-                } else if ("hourlyWeather2".equals(key)){
+                    if ("hourlyWeather1".equals(key)){
-                    setTableFonts(table.getRow(2).getCell(0), "平阴县");
+                        setTableFonts(table.getRow(1).getCell(0), "长清区");
-                    List<Map<String,Object>> weatherList = data.get(key);
+                        List<Map<String,Object>> weatherList = data.get(key);
-                    for (int i = 0; i < weatherList.size(); i++) {
+                        for (int i = 0; i < weatherList.size(); i++) {
-                        setTableFonts(table.getRow(2).getCell(i+1), weatherList.get(i).get("text").toString());
+                            OffsetDateTime offsetDateTime = OffsetDateTime.parse(weatherList.get(i).get("fxTime").toString());
-                    }
+                            setTableFonts(table.getRow(0).getCell(i+1),offsetDateTime.format(DateTimeFormatter.ofPattern("dd日HH时")));
-                } else if ("hourlyWeather3".equals(key)){
+                            setTableFonts(table.getRow(1).getCell(i+1), weatherList.get(i).get("text").toString());
-                    setTableFonts(table.getRow(3).getCell(0), "东平县");
+                        }
-                    List<Map<String,Object>> weatherList = data.get(key);
+                    } else if ("hourlyWeather2".equals(key)){
-                    for (int i = 0; i < weatherList.size(); i++) {
+                        setTableFonts(table.getRow(2).getCell(0), "平阴县");
-                        setTableFonts(table.getRow(3).getCell(i+1), weatherList.get(i).get("text").toString());
+                        List<Map<String,Object>> weatherList = data.get(key);
-                    }
+                        for (int i = 0; i < weatherList.size(); i++) {
-                } else if ("hourlyWeather4".equals(key)){
+                            setTableFonts(table.getRow(2).getCell(i+1), weatherList.get(i).get("text").toString());
-                    setTableFonts(table.getRow(4).getCell(0), "汶上县");
+                        }
-                    List<Map<String,Object>> weatherList = data.get(key);
+                    } else if ("hourlyWeather3".equals(key)){
-                    for (int i = 0; i < weatherList.size(); i++) {
+                        setTableFonts(table.getRow(3).getCell(0), "东平县");
-                        setTableFonts(table.getRow(4).getCell(i+1), weatherList.get(i).get("text").toString());
+                        List<Map<String,Object>> weatherList = data.get(key);
-                    }
+                        for (int i = 0; i < weatherList.size(); i++) {
-                } else if ("hourlyWeather5".equals(key)){
+                            setTableFonts(table.getRow(3).getCell(i+1), weatherList.get(i).get("text").toString());
-                    setTableFonts(table.getRow(5).getCell(0), "梁山县");
+                        }
-                    List<Map<String,Object>> weatherList = data.get(key);
+                    } else if ("hourlyWeather4".equals(key)){
-                    for (int i = 0; i < weatherList.size(); i++) {
+                        setTableFonts(table.getRow(4).getCell(0), "汶上县");
-                        setTableFonts(table.getRow(5).getCell(i+1), weatherList.get(i).get("text").toString());
+                        List<Map<String,Object>> weatherList = data.get(key);
+                        for (int i = 0; i < weatherList.size(); i++) {
+                            setTableFonts(table.getRow(4).getCell(i+1), weatherList.get(i).get("text").toString());
+                        }
+                    } else if ("hourlyWeather5".equals(key)){
+                        setTableFonts(table.getRow(5).getCell(0), "梁山县");
+                        List<Map<String,Object>> weatherList = data.get(key);
+                        for (int i = 0; i < weatherList.size(); i++) {
+                            setTableFonts(table.getRow(5).getCell(i+1), weatherList.get(i).get("text").toString());
+                        }
+                    } else if ("hourlyWeather6".equals(key)){
+                        setTableFonts(table.getRow(6).getCell(0), "嘉祥县");
+                        List<Map<String,Object>> weatherList = data.get(key);
+                        for (int i = 0; i < weatherList.size(); i++) {
+                            setTableFonts(table.getRow(6).getCell(i+1), weatherList.get(i).get("text").toString());
+                        }
+                    } else if ("hourlyWeather7".equals(key)){
+                        setTableFonts(table.getRow(7).getCell(0), "巨野县");
+                        List<Map<String,Object>> weatherList = data.get(key);
+                        for (int i = 0; i < weatherList.size(); i++) {
+                            setTableFonts(table.getRow(7).getCell(i+1), weatherList.get(i).get("text").toString());
+                        }
+                    } else if ("hourlyWeather8".equals(key)){
+                        setTableFonts(table.getRow(8).getCell(0), "郓城县");
+                        List<Map<String,Object>> weatherList = data.get(key);
+                        for (int i = 0; i < weatherList.size(); i++) {
+                            setTableFonts(table.getRow(8).getCell(i+1), weatherList.get(i).get("text").toString());
+                        }
                     }
-                } else if ("hourlyWeather6".equals(key)){
+                });
-                    setTableFonts(table.getRow(6).getCell(0), "嘉祥县");
+            } else {
-                    List<Map<String,Object>> weatherList = data.get(key);
+                addDescription(doc,"暂无数据");
-                    for (int i = 0; i < weatherList.size(); i++) {
+            }
-                        setTableFonts(table.getRow(6).getCell(i+1), weatherList.get(i).get("text").toString());
+
-                    }
-                } else if ("hourlyWeather7".equals(key)){
-                    setTableFonts(table.getRow(7).getCell(0), "巨野县");
-                    List<Map<String,Object>> weatherList = data.get(key);
-                    for (int i = 0; i < weatherList.size(); i++) {
-                        setTableFonts(table.getRow(7).getCell(i+1), weatherList.get(i).get("text").toString());
-                    }
-                } else if ("hourlyWeather8".equals(key)){
-                    setTableFonts(table.getRow(8).getCell(0), "郓城县");
-                    List<Map<String,Object>> weatherList = data.get(key);
-                    for (int i = 0; i < weatherList.size(); i++) {
-                        setTableFonts(table.getRow(8).getCell(i+1), weatherList.get(i).get("text").toString());
-                    }
-                }
-            });
         }
 
         //换行

zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java

@@ -40,7 +40,7 @@ public class DcBoardReleaseLog extends BaseEntity
     private String stakeMark;
 
     /** 方向1-上行,2-中,3-下行 */
-    @Excel(name = "方向1-上行,2-中,3-下行")
+    @Excel(name = "方向",readConverterExp = "1=上行,2=中,3=下行")
     @ApiModelProperty(value="方向1-上行,2-中,3-下行")
     private String direction;
 
@@ -50,7 +50,7 @@ public class DcBoardReleaseLog extends BaseEntity
     private String releaseContent;
 
     /** 发布状态（0：成功；1：失败） */
-    @Excel(name = "发布状态", readConverterExp = "0=：成功；1：失败")
+    @Excel(name = "发布状态", readConverterExp = "0=成功,1失败")
     @ApiModelProperty(value="发布状态0=：成功；1：失败")
     private String releaseStatus;
 
@@ -81,7 +81,7 @@ public class DcBoardReleaseLog extends BaseEntity
     private String releaseUserId;
 
     /** 发布端 */
-    @Excel(name = "发布端")
+    @Excel(name = "发布端", readConverterExp = "00=系统用户,01=智慧大脑,02=GIS+BIM")
     @ApiModelProperty(value="发布端（00=系统用户,01=智慧大脑,02=GIS+BIM")
     private String platform;