From bf86c2ddaeddb32d55689d2a584fa2472cdba761 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Tue, 2 Apr 2024 18:25:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DcBoardReleaseLogController.java | 18 ++++++++++++++++++ .../zc/business/domain/DcBoardReleaseLog.java | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcBoardReleaseLogController.java b/zc-business/src/main/java/com/zc/business/controller/DcBoardReleaseLogController.java index 6a926a72..8d034717 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcBoardReleaseLogController.java +++ b/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 list = dcBoardReleaseLogService.selectDcBoardReleaseLogList(dcBoardReleaseLog); + for (DcBoardReleaseLog releaseLog : list) { + String content = releaseLog.getReleaseContent(); + List> 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 util = new ExcelUtil<>(DcBoardReleaseLog.class); util.exportExcel(response, list, "情报板内容发布日志数据"); } diff --git a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java index 262dc44c..00eed7d1 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java +++ b/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; From 2a3bea215165c22b283caa11587daa3c7f2eb609 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Wed, 3 Apr 2024 16:08:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=AB=98=E9=80=9F=E5=BF=AB=E6=8A=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/WordController.java | 123 +++++++++--------- 1 file changed, 65 insertions(+), 58 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/WordController.java b/zc-business/src/main/java/com/zc/business/controller/WordController.java index b2879914..775ff31f 100644 --- a/zc-business/src/main/java/com/zc/business/controller/WordController.java +++ b/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>> data = (Map>>) ajaxResult.get("data"); - data.keySet().forEach(key ->{ - if ("hourlyWeather1".equals(key)){ - setTableFonts(table.getRow(1).getCell(0), "长清区"); - List> weatherList = data.get(key); - for (int i = 0; i < weatherList.size(); i++) { - OffsetDateTime offsetDateTime = OffsetDateTime.parse(weatherList.get(i).get("fxTime").toString()); - setTableFonts(table.getRow(0).getCell(i+1),offsetDateTime.format(DateTimeFormatter.ofPattern("dd日HH时"))); - setTableFonts(table.getRow(1).getCell(i+1), weatherList.get(i).get("text").toString()); - } - } else if ("hourlyWeather2".equals(key)){ - setTableFonts(table.getRow(2).getCell(0), "平阴县"); - List> weatherList = data.get(key); - for (int i = 0; i < weatherList.size(); i++) { - setTableFonts(table.getRow(2).getCell(i+1), weatherList.get(i).get("text").toString()); - } - } else if ("hourlyWeather3".equals(key)){ - setTableFonts(table.getRow(3).getCell(0), "东平县"); - List> weatherList = data.get(key); - for (int i = 0; i < weatherList.size(); i++) { - setTableFonts(table.getRow(3).getCell(i+1), weatherList.get(i).get("text").toString()); - } - } else if ("hourlyWeather4".equals(key)){ - setTableFonts(table.getRow(4).getCell(0), "汶上县"); - List> 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> 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()); + 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)); + + data.keySet().forEach(key ->{ + if ("hourlyWeather1".equals(key)){ + setTableFonts(table.getRow(1).getCell(0), "长清区"); + List> weatherList = data.get(key); + for (int i = 0; i < weatherList.size(); i++) { + OffsetDateTime offsetDateTime = OffsetDateTime.parse(weatherList.get(i).get("fxTime").toString()); + setTableFonts(table.getRow(0).getCell(i+1),offsetDateTime.format(DateTimeFormatter.ofPattern("dd日HH时"))); + setTableFonts(table.getRow(1).getCell(i+1), weatherList.get(i).get("text").toString()); + } + } else if ("hourlyWeather2".equals(key)){ + setTableFonts(table.getRow(2).getCell(0), "平阴县"); + List> weatherList = data.get(key); + for (int i = 0; i < weatherList.size(); i++) { + setTableFonts(table.getRow(2).getCell(i+1), weatherList.get(i).get("text").toString()); + } + } else if ("hourlyWeather3".equals(key)){ + setTableFonts(table.getRow(3).getCell(0), "东平县"); + List> weatherList = data.get(key); + for (int i = 0; i < weatherList.size(); i++) { + setTableFonts(table.getRow(3).getCell(i+1), weatherList.get(i).get("text").toString()); + } + } else if ("hourlyWeather4".equals(key)){ + setTableFonts(table.getRow(4).getCell(0), "汶上县"); + List> 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> 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> 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> 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> 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), "嘉祥县"); - List> 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> 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> 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 { + addDescription(doc,"暂无数据"); + } + } //换行