From 1f69390318995e4f346f7e8274b8b408290465c8 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Mon, 16 Dec 2024 13:26:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderController.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 87a3c85..5f62157 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -164,19 +164,16 @@ public class OrderController extends BaseController { } @ApiOperation(value = "租赁协议(查看)") - @PostMapping("/leaseAgreement") - public ResponseEntity getleaseAgreement(@RequestParam String orderId, - @RequestParam("file") MultipartFile file, - @RequestParam Map replacements) throws IOException { + @GetMapping("/leaseAgreement") + public ResponseEntity getleaseAgreement(String orderId, Map replacements) throws IOException { OrderInfoDto orderInfoDto = orderService.getAgreementByOrderId(orderId); - /* BmContract bmContract = new BmContract(); + BmContract bmContract = new BmContract(); bmContract.setStatus(1); List list = bmContractService.list(bmContract); String wordUrl = list.get(0).getBmFileInfoList().get(0).getFileUrl(); InputStream inputStream = new URL(wordUrl).openStream(); - XWPFDocument document = new XWPFDocument(inputStream);*/ - XWPFDocument document = new XWPFDocument(file.getInputStream()); + XWPFDocument document = new XWPFDocument(inputStream); //订单日期 replacements.put("${orderTime}", orderInfoDto.getOrderTime().toString()); //装备所属公司 @@ -206,20 +203,19 @@ public class OrderController extends BaseController { byte[] wordBytes = outputStream.toByteArray(); // Convert Word to Image (simple example using BufferedImage) - BufferedImage image = new BufferedImage(800, 600, BufferedImage.TYPE_INT_RGB); +/* BufferedImage image = new BufferedImage(800, 600, BufferedImage.TYPE_INT_RGB); Graphics2D graphics = image.createGraphics(); graphics.setPaint(Color.white); graphics.fillRect(0, 0, image.getWidth(), image.getHeight()); graphics.setPaint(Color.black); graphics.drawString(new String(wordBytes), 10, 20); - graphics.dispose(); - - ByteArrayOutputStream imageOutputStream = new ByteArrayOutputStream(); - ImageIO.write(image, "png", imageOutputStream); - byte[] imageBytes = imageOutputStream.toByteArray(); + graphics.dispose();*/ HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.IMAGE_PNG); - return ResponseEntity.ok().headers(headers).body(imageBytes); + headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); + headers.setContentDispositionFormData("attachment", "contract.docx"); + return ResponseEntity.ok() + .headers(headers) + .body(wordBytes); } }