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,15 +128,18 @@ public class WordController {
 
         PoiUtil.createHeading2(doc,"天气情况统计");
 
+        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");
+            if (data != null && data.size() != 0){
+
                 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 ("hourlyWeather1".equals(key)){
                         setTableFonts(table.getRow(1).getCell(0), "长清区");
@@ -190,6 +193,10 @@ public class WordController {
                         }
                     }
                 });
+            } else {
+                addDescription(doc,"暂无数据");
+            }
+
         }
 
         //换行

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;