From 25d0b36cc39f51c7b03f28f30cfc6ed5a10769d3 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 12 十月 2025 17:51:46 +0800
Subject: [PATCH] 修改了大量的代码块
---
archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java | 2 +-
ruoyi-admin/pom.xml | 6 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 45 +++++++++++++++++++++++++++++++++++++++++----
3 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
index 518b1ff..a0fc494 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
@@ -50,7 +50,7 @@
" is_canceled, format, size_type, horizontal_resolution, vertical_resolution, width,\n" +
" height, file_size, attachment_history_numbers,url, dm.remarks\n" +
" from document_materials as dm, archive_records as ar WHERE dm.record_id=ar.id \n" +
- "and dm.record_id=#{recordId}")
+ "and dm.record_id=#{recordId} and file_style!='鍏跺畠鏉愭枡' ")
List<DocumentMaterialsVoLarge> getDocumentMaterialsvoLarge(@Param("recordId") int recordId);
@Select("select count(*) as cnt, file_style from document_materials " +
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 23ef737..0fce8bd 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -23,6 +23,12 @@
<!-- <artifactId>spring-boot-devtools</artifactId>-->
<!-- <optional>true</optional> <!– 琛ㄧず渚濊禆涓嶄細浼犻�� –>-->
<!-- </dependency>-->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>5.3.2</version>
+ <scope>compile</scope>
+ </dependency>
<!-- swagger3-->
<dependency>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
index 5830c54..c833c43 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
@@ -2,10 +2,9 @@
+import java.awt.*;
import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
+import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -31,6 +30,7 @@
import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.Imaging;
+import org.springframework.mock.web.MockMultipartFile;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -178,6 +178,7 @@
else{
if(doc.getSecurityLevel().equals("璇ラ〉鍙﹀瓨"))
{
+
//鏇挎崲涓轰簡鍑嗗濂界殑鍥惧儚
//璇诲彇鏈嶅姟鍣ㄤ笂鐨勫浘鍍�
// new InputStream();
@@ -204,8 +205,44 @@
Long fileNumber = documentMaterialsService.getFiNum(nam,recordId);
//璁＄畻sizeType
String sizeType = getPageSize(wid*hei);
+
+
+ Graphics2D g2d = bufferedImage.createGraphics(); // 鑾峰彇Graphics2D瀵硅薄鐢ㄤ簬缁樺埗
+ g2d.setFont(new Font("Arial", Font.BOLD, 80)); // 璁剧疆瀛椾綋鏍峰紡鍜屽ぇ灏�
+ g2d.setColor(Color.black); // 璁剧疆瀛椾綋棰滆壊涓虹櫧鑹诧紝鍙牴鎹渶瑕佽皟鏁撮鑹插拰瀛椾綋鏍峰紡
+ String pageNumber = doc.getPageNumber()+""; // 椤电爜瀛楃涓诧紝鍙互鏍规嵁闇�瑕佷慨鏀规垨鍔ㄦ�佺敓鎴�
+ int fontHeight = g2d.getFontMetrics().getHeight(); // 鑾峰彇瀛椾綋楂樺害锛岀敤浜庡畾浣嶆枃鏈綅缃�
+ int x = bufferedImage.getWidth() - g2d.getFontMetrics().stringWidth(pageNumber) - 80; // 璁＄畻鏂囨湰X鍧愭爣浣嶇疆锛岀‘淇濆湪鍙充笅瑙掗檮杩�
+ int y = bufferedImage.getHeight() - fontHeight / 2 - 100; // 璁＄畻鏂囨湰Y鍧愭爣浣嶇疆锛屽瀭鐩村眳涓樉绀烘枃鏈�
+ g2d.drawString(pageNumber, x, y); // 鍦ㄥ浘鐗囦笂缁樺埗椤电爜鏂囨湰
+
+
+ System.out.println(pageNumber+"[[[[[[[[[[[[[[[");
+ g2d.dispose(); // 閲婃斁Graphics2D璧勬簮
+// File outputFile = new File(filePath+"/output_image.jpg"); // 杈撳嚭鏂囦欢璺緞
+// ImageIO.write(bufferedImage, "jpg", outputFile); // 淇�
+ //寰楀埌BufferedImage瀵硅薄
+ MultipartFile multipartFile = null;
+ try {
+ //鍒涘缓涓�涓狟yteArrayOutputStream
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ //鎶夿ufferedImage鍐欏叆ByteArrayOutputStream
+ ImageIO.write(bufferedImage, "jpg", os);
+ //ByteArrayOutputStream杞垚InputStream
+ InputStream input = new ByteArrayInputStream(os.toByteArray());
+ //InputStream杞垚MultipartFile
+ multipartFile = new MockMultipartFile(pageNumber, pageNumber+".jpg", "text/plain", input);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+ String fileName1 = FileUploadUtils.upload(filePath, multipartFile);
+ String url1 = serverConfig.getUrl() + fileName;
+
+
String us = "/profile/upload/0071.jpg";
- documentMaterialsService.updateByPageNumber(nam, sizeType, fileNumber,wid, hei,wdpi, hdpi, sz, us, "jpg", recordId);
+ documentMaterialsService.updateByPageNumber(nam, sizeType, fileNumber,wid, hei,wdpi, hdpi, sz, fileName1, "jpg", recordId);
}
--
Gitblit v1.9.1