From b3a3cb48d07303a2e7c3fe53c9da9a6f835c6cf9 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 26 九月 2022 16:48:45 +0800
Subject: [PATCH] 更新追加的拓展名xlsx图片处理

---
 src/main/java/com/whyc/service/ProductService.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index d1253d9..c63dbcc 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -148,6 +148,27 @@
                 workbook = WorkbookFactory.create(inputStream);
                 inputStream.close();
                 List<? extends PictureData> allPictures = workbook.getAllPictures();
+                if(fileTempUrl.substring(fileTempUrl.lastIndexOf(".")+1).equals("xlsx")) {
+                    Collections.sort(allPictures, new Comparator<PictureData>() {
+                        @Override
+                        public int compare(PictureData o1, PictureData o2) {
+                            // Name: /xl/media/image1.png - Content Type: image/png
+                            String s1 = o1.toString();
+                            int contentTypeIndex = s1.indexOf(" - Content Type");
+                            String s1Front = s1.substring(0, contentTypeIndex);
+                            String imageNumStr1 = s1Front.substring(s1Front.lastIndexOf("/") + 1, s1Front.lastIndexOf(".")).replace("image", "");
+
+                            String s2 = o2.toString();
+                            int contentTypeIndex2 = s2.indexOf(" - Content Type");
+                            String s2Front = s2.substring(0, contentTypeIndex2);
+                            String imageNumStr2 = s2Front.substring(s2Front.lastIndexOf("/") + 1, s2Front.lastIndexOf(".")).replace("image", "");
+
+                            return Integer.parseInt(imageNumStr1) - Integer.parseInt(imageNumStr2);
+
+
+                        }
+                    });
+                }
                 //鍙栫涓�涓猻heet琛�
                 Sheet sheet = workbook.getSheetAt(0);
                 int lastRowNum = sheet.getLastRowNum();

--
Gitblit v1.9.1