From 2744ca3c268b64b3245d274b2979a047817d4402 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 01 Nov 2023 16:36:55 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 104 +++++++++++++++++++++++++---------------------------
1 files changed, 50 insertions(+), 54 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index 6b5b362..776c15c 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -1,50 +1,15 @@
package com.moral.api.controller;
+import cn.afterturn.easypoi.word.WordExportUtil;
+import cn.hutool.poi.word.WordUtil;
+import com.deepoove.poi.NiceXWPFDocument;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.data.MiniTableRenderData;
import com.deepoove.poi.data.RowRenderData;
import com.deepoove.poi.data.TextRenderData;
-import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
-
-import cn.afterturn.easypoi.word.WordExportUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.ResourceUtils;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.text.ParseException;
-import java.util.ArrayList;
-
-import java.util.HashMap;
-
-import java.util.List;
-import java.util.Map;
-
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import com.moral.api.entity.Dustld;
import com.moral.api.pojo.bo.ExcelBO;
+import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
import com.moral.api.pojo.dust.DustForm;
import com.moral.api.pojo.vo.excel.DailyVo;
import com.moral.api.service.DustldService;
@@ -52,6 +17,32 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.xmlbeans.impl.jam.provider.ResourcePath;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import static com.moral.api.controller.SysTestController.getPath;
@@ -251,14 +242,17 @@
if (!params.containsKey("mac") || !params.containsKey("startTime") || !params.containsKey("endTime")){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
-
+ System.out.println(CruiserController.class.getResource("/word/���������������������.docx").getPath());
+ URL resource = getClass().getResource("/word/���������������������.docx");
+ String path = resource.getPath();
+ System.out.println(path);
Map<String, Object> map = dustldService.dailyDustlds(params);
if (ObjectUtils.isEmpty(map)){
return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
}
-// test(map,response);
-// return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg(),map);
- return ResultMessage.ok(map);
+ test(map,response);
+
+ return ResultMessage.ok();
}
@@ -321,15 +315,10 @@
}
- public void test( Map<String, Object> params,HttpServletResponse response) throws IOException {
-// String path="D:\\���������������������.docx";
- String path = getPath("���������������������.docx");
+ public static void test( Map<String, Object> params,HttpServletResponse response) throws IOException {
+ InputStream inputStream = WordUtil.class.getClassLoader().getResourceAsStream("word/���������������������.docx");
+ XWPFDocument compile = null;
try {
- //���������������������������
- File rootFile = new File(ResourceUtils.getURL("classpath:").getPath());
- File file= new File(rootFile, path);
- //������������������������
- XWPFTemplate compile = XWPFTemplate.compile(file.getPath());
//������������������������������������������������������{{}}������������������������,map������������key������������������������������������������
HashMap<String, Object> map = new HashMap<>();
//������������������������
@@ -362,13 +351,20 @@
map.put("time",params.get("time").toString());
map.put("date1",params.get("date1").toString());
map.put("date2",params.get("date2").toString());
-// map.put("data",params.get("data").toString());
- compile.render(map);
-// response.addHeader("Access-Contro1-Allow-Origin", "*");
+ File docxFile = new File("���������������������.docx");
+ FileUtils.copyToFile(inputStream,docxFile);
+ compile = WordExportUtil.exportWord07(docxFile.getPath(),map);
compile.write(response.getOutputStream());
compile.close();
+ inputStream.close();
} catch (IOException e) {
log.error ("������������������������������������������", e);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }finally {
+ compile.close();
+ inputStream.close();
+
}
}
--
Gitblit v1.8.0