From bcb1d905904fd43034f7c95077336e5cb849eff1 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 18 一月 2026 23:17:22 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java | 332 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 282 insertions(+), 50 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
index ad3a559..fa7ceef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
@@ -485,6 +485,7 @@
//绉讳氦娓呭崟
List<ArchiveRecordSmall> lrs = iArchiveRecordsService.findByIds(archiveRecords);
+ //鐢靛瓙鏂囦欢鐨勪釜鏁�
System.out.println(lrs);
System.out.println("99999999990000");
ZipEntry entry1 = new ZipEntry(fna + "绉讳氦娓呭崟" + ".xls");
@@ -517,16 +518,192 @@
for(int i = 0; i < ids.length; i++) {
System.out.println(ids[i]);
ArchiveRecords archiveRecords1 = iArchiveRecordsService.selectArchiveRecordsById(ids[i]);
+ ArchiveInfoVo aIV = iArchiveRecordsService.selectByRecordId(ids[i]);
// 鑾峰彇鏂囦欢鐨勪繚瀛樹綅缃�,璇诲彇鏁版嵁搴�,
DocumentMaterials documentMaterials = new DocumentMaterials();
documentMaterials.setRecordId(ids[i]);
- List<DocumentMaterialsVoLarge> docs = documentMaterialsService.selectDocumentMaterialsAllByRecordId(ids[i]);
- System.out.println(docs.size()+"----7777");
+
+ //鐢熸垚鏂扮殑璁板綍锛屼笉淇濆瓨鍐嶆暟鎹簱
+ List<DocumentMaterials> docAllInfo = documentMaterialsService.SelectAllRecordsByPageNumbersToList(ids[i], archiveRecords1.getPageCount());
+ //鎶奃ocumentMaterils杞埌docs
+ List<DocumentMaterialsVoLarge> docs = new ArrayList<>();
+ int nstar = 1;
+
+ //缁熻3涓潗鏂欑殑涓暟
+ int texPages = 0;
+ int picPages = 0;
+ int patPages = 0;
+ for (DocumentMaterials mater : docAllInfo) {
+ // physcialService.mySave(physcial);
+ DocumentMaterialsVoLarge docum = new DocumentMaterialsVoLarge();
+ BeanUtils.copyProperties(mater, docum);
+ docum.setRecordId(archiveRecords1.getRecordId());
+ docum.setNum(nstar++);
+ docs.add(docum);
+ if(mater.getFileStyle()!=null&&mater.getFileStyle().equals("鏂囧瓧鏉愭枡"))
+ texPages++;
+ if(mater.getFileStyle()!=null&&mater.getFileStyle().equals("鍥炬牱鏉愭枡"))
+ patPages++;
+ if(mater.getFileStyle()!=null&&mater.getFileStyle().equals("鐓х墖鏉愭枡"))
+ picPages++;
+ }
+
+
+
+ //鎶婇檮浠跺拰璁板綍涓�涓�瀵瑰簲
+ String fileSysPath = RuoYiConfig.getUploadPath();
+ AjaxResult ajax = AjaxResult.success();
+ String path = fileSysPath + File.separator + ids[i];
+ File desc = new File(fileSysPath + File.separator + ids[i]);
+ System.out.println("44444444444444456666666666666666");
+ if (!desc.exists())
+ {
+ throw new RuntimeException("鐢靛瓙鏂囦欢淇℃伅娌℃湁涓婁紶锛岃琛ュ厖锛�");
+ }
+
+
+ Map<String, String> fileMap = new HashMap<>();
+ try (Stream<Path> paths = Files.walk(Paths.get(path))) {
+ fileMap = paths
+ .filter(Files::isRegularFile)
+ .collect(Collectors.toMap(
+ // Key: 鏂囦欢鍚嶅墠缂�锛堜笉甯︽墿灞曞悕锛�
+ Path -> {
+ String fileNam = Path.getFileName().toString();
+ int dotIndex = fileNam.lastIndexOf('.');
+ return dotIndex > 0 ? fileNam.substring(0, dotIndex) : fileNam;
+ },
+ // Value: 鏂囦欢鍏ㄨ矾寰�
+ Path::toString,
+ // 澶勭悊閲嶅閿殑鎯呭喌锛堝鏋滄湁鐩稿悓鍓嶇紑鐨勬枃浠讹級
+ (existing, replacement) -> existing
+ ));
+
+ }
+
+
+ //閲嶆柊灏佽涓�涓媎ocs,鍜岄檮浠剁粦瀹氬啀涓�璧�
+
+ for (int k = 0; k < docs.size(); k++) {
+ DocumentMaterialsVoLarge dc = docs.get(k);
+ if (dc.getSecurityLevel() != null && (dc.getSecurityLevel().equals("璇ラ〉鍙﹀瓨") ||
+ dc.getSecurityLevel().equals("绉樺瘑") || dc.getSecurityLevel().equals("鍐呴儴鐢ㄩ��") ||
+ dc.getSecurityLevel().equals("鍐呴儴鐢ㄥ浘"))) {
+ // 鏇挎崲涓轰簡鍑嗗濂界殑鍥惧儚
+ String fp = fileSysPath + "\\glc.jpg";
+ Path path1 = Paths.get(fp);
+ // 鎷垮埌鍥惧儚灞炴��
+ BufferedImage bufferedImage = ImageIO.read(Files.newInputStream(path1));
+ int wid = bufferedImage.getWidth();
+ int hei = bufferedImage.getHeight();
+ double sz = Double.parseDouble(String.format("%.2f", Files.size(path1) * 1.0 / 1024));
+
+ // 鎷垮埌鍥惧儚鐨刣pi淇℃伅
+ ImageInfo info = Imaging.getImageInfo(Files.readAllBytes(path1));
+ int wdpi = info.getPhysicalWidthDpi();
+ int hdpi = info.getPhysicalHeightDpi();
+
+ // 璁＄畻fileNumber
+ // Long fileNumber = documentMaterialsService.getFiNum(nam, recordId);
+ // 璁＄畻sizeType
+ String sizeType = getPageSize(wid * hei);
+
+ Graphics2D g2d = bufferedImage.createGraphics();
+ g2d.setFont(new java.awt.Font("瀹嬩綋", Font.BOLD, 80)); // 璁剧疆瀛椾綋鏍峰紡鍜屽ぇ灏�
+ g2d.setColor(Color.black);
+ String pageNumber = dc.getPageNumber() + "";
+ int fontHeight = g2d.getFontMetrics().getHeight();
+ int x = bufferedImage.getWidth() - g2d.getFontMetrics().stringWidth(pageNumber) - 80;
+ int y = bufferedImage.getHeight() - fontHeight / 2 - 100;
+ g2d.drawString(pageNumber, x, y);
+ g2d.dispose();
+
+ // 灏咮ufferedImage杞崲涓篗ultipartFile
+ MultipartFile multipartFile = null;
+ ByteArrayOutputStream ost = new ByteArrayOutputStream();
+ ImageIO.write(bufferedImage, "jpg", ost);
+ InputStream input = new ByteArrayInputStream(ost.toByteArray());
+ multipartFile = new MockMultipartFile(pageNumber, pageNumber + ".jpg", "text/plain", input);
+
+ // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+ String fileName1 = FileUploadUtils.upload(fileSysPath, multipartFile);
+ // filePath = fileName1;
+ dc.setWidth((long) wid);
+ dc.setHeight((long) hei);
+ dc.setFileSize(sz);
+ dc.setFormat(".jpg");
+ dc.setHorizontalResolution((long) wdpi);
+ dc.setVerticalResolution((long) hdpi);
+ dc.setSizeType(sizeType);
+ fileMap.put(dc.getPageNumber()+"", fileName1);
+ // dc.set
+ // 鏇存柊鏁版嵁搴�
+ // documentMaterialsService.updateByPageNumber(nam, sizeType, fileNumber, wid, hei, wdpi, hdpi, sz, fileName1, "jpg", recordId);
+
+// urls.add(serverConfig.getUrl() + fileName1);
+// fileNames.add(fileName1);
+// newFileNames.add(FileUtils.getName(fileName1));
+// originalFilenames.add(pageNumber + ".jpg");
+ }
+ else {
+ //鏂囦欢鍚嶇О
+ // String pname = nams[1];
+ // ajax.put("url", url);
+ //鎷垮埌鍥惧儚灞炴��
+ System.out.println(dc.getPageNumber());
+ String fip = fileMap.get(dc.getPageNumber().toString());
+// 鍒涘缓 File 瀵硅薄
+ if (fip == null) {
+ // 琛ラ浂鍒�4浣嶏紙鏍规嵁浣犵殑闇�姹傝皟鏁翠綅鏁帮級
+ String paddedKey = frontCompWithZore(4, dc.getPageNumber().intValue());
+ fip = fileMap.get(paddedKey);
+ }
+ File fils = new File(fip);
+
+// 浣跨敤 ImageIO 璇诲彇鍥剧墖
+ BufferedImage image = ImageIO.read(fils);
+ BufferedImage bufferedImage = ImageIO.read(fils);
+ int wid = bufferedImage.getWidth();
+ int hei = bufferedImage.getHeight();
+ double sz = Double.parseDouble(String.format("%.2f", fils.length()*1.0/1024));
+ System.out.println(wid+":"+hei+":"+sz);
+ //鎷垮埌鍥惧儚鐨刣pi淇℃伅
+ byte[] bytesArray = new byte[(int) fils.length()];
+
+ FileInputStream fis = new FileInputStream(fils);
+ fis.read(bytesArray); //read file into bytes[]
+
+ ImageInfo info = Imaging.getImageInfo(bytesArray);
+
+
+ int wdpi = info.getPhysicalWidthDpi() ;
+ int hdpi = info.getPhysicalHeightDpi();
+ // System.out.println("DPI: " + info.getPhysicalWidthDpi()+nam+"dds");
+
+ fis.close();
+ //璁＄畻fileNumber
+ // Long fileNumber = documentMaterialsService.getFiNum(dc.getPageNumber(), id);
+ //璁＄畻sizeType
+ String sizeType = getPageSize(wid*hei);
+
+ dc.setWidth((long) wid);
+ dc.setHeight((long) hei);
+ dc.setFileSize(sz);
+ dc.setFormat(".jpg");
+ dc.setHorizontalResolution((long) wdpi);
+ dc.setVerticalResolution((long) hdpi);
+ dc.setSizeType(sizeType);
+ }
+ }
+
+ List<DocumentMaterialsVo> dsvs = documentMaterialsService.findArchMInfo(ids[i].toString(), archiveRecords1.getPageCount());
+
+// List<DocumentMaterialsVoLarge> docs = documentMaterialsService.selectDocumentMaterialsAllByRecordId(ids[i]);
+// System.out.println(docs.size()+"----7777");
//.selectDocumentMaterialsList(documentMaterials);
- List<DocumentMaterialsVo> dsvs = documentMaterialsService.findArchMInfo(ids[i].toString(), archiveRecords1.getPageCount());
- ArchiveInfoVo aIV = iArchiveRecordsService.selectByRecordId(ids[i]);
+
System.out.println(aIV.getInquiryNumber());
System.out.println(aIV.getRecordId());
String adir = aIV.getInquiryNumber() + " " + aIV.getRecordId();
@@ -601,21 +778,21 @@
HashMap<String, Object> hs = new HashMap<String, Object>();
int allPages = 0;
- int texPages = 0;
- int picPages = 0;
- int patPages = 0;
- if(!dmfs.isEmpty())
- {
- for(DocumentMaterialFileStyle documentMaterialFileStyle:dmfs)
- {
- if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鏂囧瓧鏉愭枡"))
- texPages = documentMaterialFileStyle.getCnt();
- if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鍥炬牱鏉愭枡"))
- patPages = documentMaterialFileStyle.getCnt();
- if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鐓х墖鏉愭枡"))
- picPages = documentMaterialFileStyle.getCnt();
- }
- }
+// int texPages = 0;
+// int picPages = 0;
+// int patPages = 0;
+// if(!dmfs.isEmpty())
+// {
+// for(DocumentMaterialFileStyle documentMaterialFileStyle:dmfs)
+// {
+// if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鏂囧瓧鏉愭枡"))
+// texPages = documentMaterialFileStyle.getCnt();
+// if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鍥炬牱鏉愭枡"))
+// patPages = documentMaterialFileStyle.getCnt();
+// if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鐓х墖鏉愭枡"))
+// picPages = documentMaterialFileStyle.getCnt();
+// }
+// }
String compName = "骞垮窞鐩堝妗ｆ绠＄悊鏈夐檺鍏徃";
@@ -778,6 +955,9 @@
// 鍒涘缓PDF淇濆瓨閫夐」
com.aspose.cells.PdfSaveOptions pdfSaveOptions = new com.aspose.cells.PdfSaveOptions();
pdfSaveOptions.setCompliance(com.aspose.cells.PdfCompliance.PDF_A_1_B);
+ // 纭繚瀛椾綋宓屽叆鍒癙DF涓�
+
+
// 鍒涘缓涓存椂瀛楄妭杈撳嚭娴�
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -929,12 +1109,22 @@
byte[] buf = new byte[1024];
for (DocumentMaterialsVoLarge dc : docs) {
- String filePath = dc.getUrl();
- if(filePath==null)
- continue;
- filePath = filePath.replace("/profile/", RuoYiConfig.getProfile() + "/");
+ String filePath = fileMap.get(dc.getPageNumber().toString());
+
+ // filePath = filePath.replace("/profile/", RuoYiConfig.getProfile() + "/");
System.out.println(filePath);
+ if (filePath == null) {
+ // 琛ラ浂鍒�4浣嶏紙鏍规嵁浣犵殑闇�姹傝皟鏁翠綅鏁帮級
+ String paddedKey = frontCompWithZore(4, dc.getPageNumber().intValue());
+ filePath = fileMap.get(paddedKey);
+ }
+ if(filePath==null)
+ continue;
+
+ if(filePath.contains("profile"))
+ filePath = filePath.replace("/profile/", RuoYiConfig.getProfile() + "/");
+
File tempFile = new File(filePath);
//鍦ㄥ帇缂╁寘涓坊鍔犳枃浠跺す
@@ -944,7 +1134,7 @@
String fname = "";
if(dc.getFileNumber()!=null&&dc.getPageNumber()!=null) {
fname = frontCompWithZore(4, dc.getFileNumber().intValue()) + "-" + dc.getTitle() + "-" + frontCompWithZore(4, dc.getPageNumber().intValue()) + "."
- + dc.getUrl().split("\\.")[1];
+ + filePath.split("\\.")[1];
if (dc.getStage().equals("01-鐢宠鏉愭枡"))
zos.putNextEntry(new ZipEntry(fna + adir + "/01-鐢宠鏉愭枡/" + fname));
else if (dc.getStage().equals("02-鍔炴杩囩▼鏉愭枡"))
@@ -1019,19 +1209,25 @@
public void packDownload(HttpServletResponse response, @PathVariable Long id) throws Exception {
-
// 鑾峰彇鏂囦欢鐨勪繚瀛樹綅缃�,璇诲彇鏁版嵁搴�,
DocumentMaterials documentMaterials = new DocumentMaterials();
documentMaterials.setRecordId(id);
- // List<DocumentMaterialsVoLarge> docs = documentMaterialsService.selectDocumentMaterialsAllByRecordId(id);
+ // List<DocumentMaterialsVoLarge> docs = documentMaterialsService.selectDocumentMaterialsAllByRecordId(id);
//鏍规嵁id鎷垮埌pageNumber
ArchiveInfoVo aIV = iArchiveRecordsService.selectByRecordId(id);
- System.out.println(aIV.getPageCount()+"++++++++++++++++==");
+ System.out.println(aIV.getPageCount() + "++++++++++++++++==");
//鐢熸垚鏂扮殑璁板綍锛屼笉淇濆瓨鍐嶆暟鎹簱
List<DocumentMaterials> docAllInfo = documentMaterialsService.SelectAllRecordsByPageNumbersToList(id, aIV.getPageCount());
+ if (docAllInfo==null||docAllInfo.isEmpty())
+ {
+ throw new RuntimeException("璇疯ˉ鍏呭畬鏁翠俊鎭紝鐒跺悗瀵煎嚭ISO鍖咃紒");
+ }
//鎶奃ocumentMaterils杞埌docs
List<DocumentMaterialsVoLarge> docs = new ArrayList<>();
int nstar = 1;
+ int texPages = 0;
+ int patPages = 0;
+ int picPages = 0;
for (DocumentMaterials mater : docAllInfo) {
// physcialService.mySave(physcial);
DocumentMaterialsVoLarge docum = new DocumentMaterialsVoLarge();
@@ -1039,6 +1235,12 @@
docum.setRecordId(aIV.getRecordId());
docum.setNum(nstar++);
docs.add(docum);
+ if(mater.getFileStyle()!=null&&mater.getFileStyle().equals("鏂囧瓧鏉愭枡"))
+ texPages++;
+ if(mater.getFileStyle()!=null&&mater.getFileStyle().equals("鍥炬牱鏉愭枡"))
+ patPages++;
+ if(mater.getFileStyle()!=null&&mater.getFileStyle().equals("鐓х墖鏉愭枡"))
+ picPages++;
}
System.out.println(docs.size()+"----009");
@@ -1130,7 +1332,9 @@
dc.setHorizontalResolution((long) wdpi);
dc.setVerticalResolution((long) hdpi);
dc.setSizeType(sizeType);
- fileMap.put(dc.getPageNumber()+"", fp);
+ System.out.println(fileName1);
+ System.out.println("gggggggggggggggg999999999999");
+ fileMap.put(dc.getPageNumber()+"", fileName1);
// dc.set
// 鏇存柊鏁版嵁搴�
// documentMaterialsService.updateByPageNumber(nam, sizeType, fileNumber, wid, hei, wdpi, hdpi, sz, fileName1, "jpg", recordId);
@@ -1147,7 +1351,20 @@
//鎷垮埌鍥惧儚灞炴��
System.out.println(dc.getPageNumber());
String fip = fileMap.get(dc.getPageNumber().toString());
+ // 濡傛灉鐩存帴鍖归厤澶辫触锛屽皾璇曡ˉ闆跺尮閰�
+ if (fip == null) {
+ // 琛ラ浂鍒�4浣嶏紙鏍规嵁浣犵殑闇�姹傝皟鏁翠綅鏁帮級
+ String paddedKey = frontCompWithZore(4, dc.getPageNumber().intValue());
+ fip = fileMap.get(paddedKey);
+ }
// 鍒涘缓 File 瀵硅薄
+ if(fip==null||fip.equals(""))
+ {
+ throw new RuntimeException("鐢靛瓙鏂囦欢淇℃伅娌℃湁涓婁紶瀹屾暣锛岃琛ュ厖锛�");
+
+
+ }
+
File file = new File(fip);
// 浣跨敤 ImageIO 璇诲彇鍥剧墖
@@ -1206,7 +1423,7 @@
//鍘嬬缉鏂囦欢
List<String> filePathList = paths;
//鎶奷ocmentMaterial杞负
- File file = compressedFileToZip(docs, dsvs, aIV, id, fileMap);
+ File file = compressedFileToZip(docs, dsvs, aIV, id, fileMap, texPages, patPages, picPages);
System.out.println(file.getName());
String fileName =aIV.getRecordId()+".zip";
@@ -1300,7 +1517,10 @@
// 鍘嬬缉鏂囦欢
- private File compressedFileToZip(List<DocumentMaterialsVoLarge> docs, List<DocumentMaterialsVo> dsvs, ArchiveInfoVo aIV, Long id, Map<String, String> fileMap) throws Exception {
+ private File compressedFileToZip(List<DocumentMaterialsVoLarge> docs, List<DocumentMaterialsVo> dsvs, ArchiveInfoVo aIV, Long id, Map<String, String> fileMap,
+ int texPages,
+ int patPages,
+ int picPages) throws Exception {
//鍘嬬缉鍖呭叿浣撳悕绉帮紙鎷兼帴鏃堕棿鎴抽槻姝㈤噸鍚嶏級
String datumName = "";
String zipFileName =dsvs.get(0).getDocumentNumber()+aIV.getRecordId()+ ".zip";
@@ -1324,7 +1544,7 @@
String pdf09Path = "09-澶囪�冭〃.pdf";
// pdfGenerateService.generateFileStyleInfo(pdf09Path, aIV.getRecordId(), id);
//鎷垮埌鐩稿叧鏁版嵁
- List<DocumentMaterialFileStyle> dmfs = documentMaterialsService.findFileStyleInfo(Math.toIntExact(id));
+ // List<DocumentMaterialFileStyle> dmfs = documentMaterialsService.findFileStyleInfo(Math.toIntExact(id));
LocalDate currentDate = LocalDate.now();
@@ -1333,21 +1553,21 @@
HashMap<String, Object> hs = new HashMap<String, Object>();
int allPages = 0;
- int texPages = 0;
- int picPages = 0;
- int patPages = 0;
- if(!dmfs.isEmpty())
- {
- for(DocumentMaterialFileStyle documentMaterialFileStyle:dmfs)
- {
- if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鏂囧瓧鏉愭枡"))
- texPages = documentMaterialFileStyle.getCnt();
- if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鍥炬牱鏉愭枡"))
- patPages = documentMaterialFileStyle.getCnt();
- if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鐓х墖鏉愭枡"))
- picPages = documentMaterialFileStyle.getCnt();
- }
- }
+// int texPages = 0;
+// int picPages = 0;
+// int patPages = 0;
+// if(!docs.isEmpty())
+// {
+// for(DocumentMaterialsVoLarge documentMaterialFileStyle:docs)
+// {
+// if(documentMaterialFileStyle!=null&&documentMaterialFileStyle.getFileStyle().equals("鏂囧瓧鏉愭枡"))
+// texPages = documentMaterialFileStyle.getCnt();
+// if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鍥炬牱鏉愭枡"))
+// patPages = documentMaterialFileStyle.getCnt();
+// if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鐓х墖鏉愭枡"))
+// picPages = documentMaterialFileStyle.getCnt();
+// }
+// }
String compName = "骞垮窞鐩堝妗ｆ绠＄悊鏈夐檺鍏徃";
String li_person = "浠囩縺";
@@ -1681,8 +1901,7 @@
byte[] buf = new byte[1024];
for (DocumentMaterialsVoLarge dc : docs) {
String filePath = fileMap.get(dc.getPageNumber().toString());
- if(filePath==null)
- continue;
+
// else {
// // 鏂囦欢鍚嶇О
@@ -1714,7 +1933,20 @@
//
+ if (filePath == null) {
+ // 琛ラ浂鍒�4浣嶏紙鏍规嵁浣犵殑闇�姹傝皟鏁翠綅鏁帮級
+ String paddedKey = frontCompWithZore(4, dc.getPageNumber().intValue());
+ filePath = fileMap.get(paddedKey);
+ System.out.println(paddedKey);
+ }
+ System.out.println(filePath);
+
+ if(filePath==null)
+ continue;
+
+ if(filePath.contains("profile"))
+ filePath = filePath.replace("/profile/", RuoYiConfig.getProfile() + "/");
File tempFile = new File(filePath);
System.out.println(filePath);
@@ -1733,10 +1965,10 @@
String fname = "";
// if(dc.getFileNumber()!=null&&dc.getPageNumber()!=null) {
- if(dc.getPageNumber()!=null) {
+ if(dc.getFileNumber()!=null&&dc.getPageNumber()!=null) {
// fname = frontCompWithZore(4, dc.getFileNumber().intValue()) + "-" + dc.getTitle() + "-" + frontCompWithZore(4, dc.getPageNumber().intValue()) + "."
// + filePath.split("\\.")[1];
- fname = "-" + dc.getTitle() + "-" + frontCompWithZore(4, dc.getPageNumber().intValue()) + "."
+ fname = frontCompWithZore(4, dc.getFileNumber().intValue()) +"-" + dc.getTitle() + "-" + frontCompWithZore(4, dc.getPageNumber().intValue()) + "."
+ filePath.split("\\.")[1];
System.out.println(fname);
--
Gitblit v1.9.1