Merge remote-tracking branch 'origin/0730_word'

# Conflicts: # src/main/java/com/ash/util/JFChartUtils.java

Merge remote-tracking branch 'origin/0730_word'
# Conflicts: # src/main/java/com/ash/util/JFChartUtils.java
胡翰林
2 parents 4bd36a55 17140252
Showing 3 changed files with 42 additions and 9 deletions
src/main/java/com/ash/controller/StatisticsController.java
src/main/java/com/ash/util/JFChartUtils.java
src/main/sql/ash.sql
--- a/src/main/java/com/ash/controller/StatisticsController.java
View file @11c835e
+++ b/src/main/java/com/ash/controller/StatisticsController.java
View file @11c835e
@@ -28,6 +28,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -471,8 +474,8 @@ public class StatisticsController extends BaseController {
         String filePath = JFChartUtils.OUTPUT_DIR + fileName;
         String dataRange = "【" + (startTime.equals(endTime) ? startTime : startTime + "~" + endTime) + "】";
-
-        buildWord(dataMap, dataRange, filePath);
+        List<String> tempFilePath = new ArrayList<>();
+        buildWord(dataMap, dataRange, filePath, tempFilePath);
         try {
             response.setContentType("application/octet-stream");
             response.setCharacterEncoding("utf-8");
@@ -491,15 +494,29 @@ public class StatisticsController extends BaseController {
             outputStream.close();
         } catch (Exception e) {
             e.printStackTrace();
+        } finally {
+            tempFilePath.add(filePath);
+            for (String tp : tempFilePath) {
+                File t = new File(tp);
+                if (t.exists()) {
+                    if (!t.delete()) {
+                        log.error("delete tempfile error!" + tp);
+                    }
+                }
+            }
         }
     }
     @SuppressWarnings("unchecked")
-    public void buildWord(Map<String, Object> data, String dataRange, String filePath) throws IOException {
+    public void buildWord(Map<String, Object> data, String dataRange, String filePath, List<String> tempFilePath) throws IOException {
         ClassPathResource resource = new ClassPathResource("/template/statisticsReport.docx");
-        File file = new File(resource.getFile().toPath().toString());
+        Path tempFile = Files.createTempFile("custTemp", ".docx");
+        try (InputStream inputStream = resource.getInputStream()) {
+            Files.copy(inputStream, tempFile, StandardCopyOption.REPLACE_EXISTING);
+        }
+
         Map<String, Object> dataMap = new HashMap<>();
@@ -533,57 +550,67 @@ public class StatisticsController extends BaseController {
         List<PieChartVo> wiAreaDataList = (List<PieChartVo>) data.get("wiAreaData");
         String dailyPicFile = JFChartUtils.createChart(wiAreaDataList, JFChartTypeEnum.PIE, dataRange + "警情分布图", "市", "数量");
         dataMap.put("sWIAreaPic", Pictures.ofStream(new FileInputStream(dailyPicFile), PictureType.JPEG).size(600, 200).create());
+        tempFilePath.add(dailyPicFile);
         //警情各地市环比变化柱状图
         List<PieChartVo> wissAreaData = (List<PieChartVo>) data.get("wissAreaData");
         String sWISeqAreaPic = JFChartUtils.createChart(wissAreaData, JFChartTypeEnum.BAR, dataRange + "警情环比情况", "市", "环比");
         dataMap.put("sWISeqAreaPic", Pictures.ofStream(new FileInputStream(sWISeqAreaPic), PictureType.JPEG).size(600, 200).create());
+        tempFilePath.add(sWISeqAreaPic);
         //警情子类分布
         List<PieChartVo> wiSubTypeData = (List<PieChartVo>) data.get("wiSubTypeData");
         String wiSubTypeDataPic = JFChartUtils.createChart(wiSubTypeData, JFChartTypeEnum.PIE, dataRange + "警情类别分布", "警情类别", "数量");
         dataMap.put("wiSubTypeDataPic", Pictures.ofStream(new FileInputStream(wiSubTypeDataPic), PictureType.JPEG).size(600, 200).create());
-
+        tempFilePath.add(wiSubTypeDataPic);
         //警情分析
         List<PieChartVo> wisDateData = (List<PieChartVo>) data.get("wisDateData");
         String wisDateDataPic = JFChartUtils.createChart(wisDateData, JFChartTypeEnum.LINE, dataRange + "警情趋势", "市", "数量");
         dataMap.put("wisDateDataPic", Pictures.ofStream(new FileInputStream(wisDateDataPic), PictureType.JPEG).size(600, 200).create());
+        tempFilePath.add(wisDateDataPic);
         //案件各地市分布
         List<PieChartVo> caseAreaData = (List<PieChartVo>) data.get("caseAreaData");
         String caseAreaDataPic = JFChartUtils.createChart(caseAreaData, JFChartTypeEnum.PIE, dataRange + "案件分布图", "市", "数量");
         dataMap.put("caseAreaDataPic", Pictures.ofStream(new FileInputStream(caseAreaDataPic), PictureType.JPEG).size(600, 200).create());
+        tempFilePath.add(caseAreaDataPic);
         //电诈案件环比情况
         List<PieChartVo> caseSsAreaData = (List<PieChartVo>) data.get("caseSsAreaData");
         String caseSsAreaDataPic = JFChartUtils.createChart(caseSsAreaData, JFChartTypeEnum.BAR, dataRange + "电诈案件环比情况", "市", "环比");
         dataMap.put("caseSsAreaDataPic", Pictures.ofStream(new FileInputStream(caseSsAreaDataPic), PictureType.JPEG).size(600, 200).create());
+        tempFilePath.add(caseSsAreaDataPic);
         //案件诈骗类型分布
         List<PieChartVo> csfData = (List<PieChartVo>) data.get("csfData");
         String sCsfDataPic = JFChartUtils.createChart(csfData, JFChartTypeEnum.PIE, dataRange + "诈骗类型分布", "诈骗类型", "数量");
         dataMap.put("sCsfDataaPic", Pictures.ofStream(new FileInputStream(sCsfDataPic), PictureType.JPEG).size(600, 200).create());
+        tempFilePath.add(sCsfDataPic);
         //案件引流方式分布图
         List<PieChartVo> ccrmData = (List<PieChartVo>) data.get("ccrmData");
         String ccrmDataPic = JFChartUtils.createChart(ccrmData, JFChartTypeEnum.PIE, dataRange + "引流方式分布图", "引流方式", "数量");
         dataMap.put("ccrmDataPic", Pictures.ofStream(new FileInputStream(ccrmDataPic), PictureType.JPEG).size(600, 200).create());
+        tempFilePath.add(ccrmDataPic);
         //案件支付方式分布图
         List<PieChartVo> ccpmData = (List<PieChartVo>) data.get("ccpmData");
         String ccpmDataPic = JFChartUtils.createChart(ccpmData, JFChartTypeEnum.PIE, dataRange + "支付方式分布图", "支付方式", "数量");
         dataMap.put("ccpmDataPic", Pictures.ofStream(new FileInputStream(ccpmDataPic), PictureType.JPEG).size(600, 200).create());
+        tempFilePath.add(ccpmDataPic);
         //案件受害人职业分布图
         List<PieChartVo> ccCareerData = (List<PieChartVo>) data.get("ccCareerData");
         String ccCareerDataPic = JFChartUtils.createChart(ccCareerData, JFChartTypeEnum.BAR, dataRange + "受害人职业分布图", "受害人职业", "数量");
         dataMap.put("ccCareerDataPic", Pictures.ofStream(new FileInputStream(ccCareerDataPic), PictureType.JPEG).size(600, 200).create());
+        tempFilePath.add(ccCareerDataPic);
         //案损分布
         List<PieChartVo> ccLossData = (List<PieChartVo>) data.get("ccLossData");
         String ccLossDataPic = JFChartUtils.createChart(ccLossData, JFChartTypeEnum.BAR, dataRange + "案损分布", "案损", "数量");
         dataMap.put("ccLossDataPic", Pictures.ofStream(new FileInputStream(ccLossDataPic), PictureType.JPEG).size(600, 200).create());
+        tempFilePath.add(ccLossDataPic);
         int clIndex = 1;
         for (PieChartVo clData : ccLossData) {
@@ -595,7 +622,7 @@ public class StatisticsController extends BaseController {
         List<PieChartVo> ccDateData = (List<PieChartVo>) data.get("ccDateData");
         String ccDateDataPic = JFChartUtils.createChart(ccDateData, JFChartTypeEnum.LINE, dataRange + "发案趋势", "日期", "数量");
         dataMap.put("ccDateDataPic", Pictures.ofStream(new FileInputStream(ccDateDataPic), PictureType.JPEG).size(600, 200).create());
-
+        tempFilePath.add(ccDateDataPic);
         //案件受害人性别占比
         List<PieChartVo> sexData = (List<PieChartVo>) data.get("sexData");
@@ -724,11 +751,15 @@ public class StatisticsController extends BaseController {
         dataMap.put("caseLossAreas", caseLossAreas);
-        try (XWPFTemplate template = XWPFTemplate.compile(file, Configure.newBuilder().buildGramer("${", "}").build())
+        try (XWPFTemplate template = XWPFTemplate.compile(tempFile.toFile(), Configure.newBuilder().buildGramer("${", "}").build())
                 .render(dataMap)) {
             template.writeToFile(filePath);
         }
+        //清理临时文件
+        File tf = tempFile.toFile();
+        tf.deleteOnExit();
+
     }
 }
--- a/src/main/java/com/ash/util/JFChartUtils.java
View file @11c835e
+++ b/src/main/java/com/ash/util/JFChartUtils.java
View file @11c835e
@@ -29,7 +29,7 @@ import java.util.List;
 @Component
 public class JFChartUtils {
-    public static final String OUTPUT_DIR = "/web/report/analysis/";
+    public static final String OUTPUT_DIR = "/tmp/report/analysis/";
     private static final String PIC_DIR = OUTPUT_DIR + "pic/";
     public static List<Color> colorList = new ArrayList<>();
--- a/src/main/sql/ash.sql
View file @11c835e
+++ b/src/main/sql/ash.sql
View file @11c835e
@@ -138,4 +138,6 @@ create table `t_ash_user`
 ) comment = '用户表' ENGINE = InnoDB;
 create index i_user_l on t_ash_user(login_name);
-create unique index u_user_login_name on t_ash_user (login_name);
+create unique index u_user_login_name on t_ash_user (login_name);
+
+ALTER TABLE t_ash_warning_instance_analysis ADD COLUMN county VARCHAR(50)   NULL;