From 46020ff26ee1a4e715f244f56de4af95e8a6df16 Mon Sep 17 00:00:00 2001 From: zhanghai <120228220@qq.com> Date: Sun, 7 Jan 2024 15:19:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=92=E5=BA=8F=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/docus/sw/souyin/CheckService.java | 11 ++++++----- src/test/java/JpmTest.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/docus/sw/souyin/CheckService.java b/src/main/java/com/docus/sw/souyin/CheckService.java index 0dffcb5..231eff4 100644 --- a/src/main/java/com/docus/sw/souyin/CheckService.java +++ b/src/main/java/com/docus/sw/souyin/CheckService.java @@ -16,6 +16,7 @@ import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.math.BigInteger; import java.nio.file.Files; import java.nio.file.StandardCopyOption; import java.util.*; @@ -193,16 +194,16 @@ public class CheckService { @Override public int compare(CheckPageRow file1, CheckPageRow file2) { // 使用正则表达式提取数字部分 - long num1 = extractNumber(file1.getPhNum()); - long num2 = extractNumber(file2.getPhNum()); + BigInteger num1 = extractNumber(file1.getPhNum()); + BigInteger num2 = extractNumber(file2.getPhNum()); // 比较提取的数字部分 - return Long.compare(num1, num2); + return num1.compareTo( num2); } - private long extractNumber(String fileName) { + private BigInteger extractNumber(String fileName) { String numberPart = fileName.replaceAll("[^0-9]", ""); - return numberPart.isEmpty() ? 0 : Long.parseLong(numberPart); + return numberPart.isEmpty() ? new BigInteger("0") :new BigInteger(numberPart); } }; Collections.sort(checkPageRows,fileComparator); diff --git a/src/test/java/JpmTest.java b/src/test/java/JpmTest.java index c679873..0ad634c 100644 --- a/src/test/java/JpmTest.java +++ b/src/test/java/JpmTest.java @@ -35,7 +35,7 @@ public class JpmTest { Date date = directory.getDate(ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL); } public static void main(String[] args) throws ImageProcessingException, IOException, ImageReadException { - File file = new File("C:\\Users\\zhanghai\\Downloads\\微信图片_20231203095721.jpg"); + File file = new File("C:\\Users\\zhanghai\\Documents\\WeChat Files\\wxid_wexo4ubjorso22\\FileStorage\\File\\2024-01\\2285.tif"); ImageInfo imageInfo = Imaging.getImageInfo(file); int height = imageInfo.getHeight(); int width = imageInfo.getWidth();