From c4fc4bd4f82cfe9abb930b874fb8d9190c2d77f7 Mon Sep 17 00:00:00 2001 From: yexuejc <1107047387@qq.com> Date: Wed, 19 Jul 2023 20:14:15 +0800 Subject: [PATCH] =?UTF-8?q?[update]FileUtil=E4=BC=98=E5=8C=96=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/yexuejc/base/pojo/ReadFileBean.java | 4 ++++ src/main/java/com/yexuejc/base/util/FileUtil.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yexuejc/base/pojo/ReadFileBean.java b/src/main/java/com/yexuejc/base/pojo/ReadFileBean.java index 98e6667..4cf0a56 100644 --- a/src/main/java/com/yexuejc/base/pojo/ReadFileBean.java +++ b/src/main/java/com/yexuejc/base/pojo/ReadFileBean.java @@ -120,4 +120,8 @@ public class ReadFileBean { public String lineScavenge(String lineData) { return this.lineScavenger.apply(lineData); } + + public boolean hasNext() { + return this.fileLength > this.pointer; + } } diff --git a/src/main/java/com/yexuejc/base/util/FileUtil.java b/src/main/java/com/yexuejc/base/util/FileUtil.java index a5bbb37..e390d66 100644 --- a/src/main/java/com/yexuejc/base/util/FileUtil.java +++ b/src/main/java/com/yexuejc/base/util/FileUtil.java @@ -504,7 +504,7 @@ public class FileUtil { List datas = new ArrayList<>(); int row = 1; String line; - while ((line = randomAccessFile.readLine()) != null && row < readFileBean.getReadRowNum()) { + while ((line = randomAccessFile.readLine()) != null && row <= readFileBean.getReadRowNum()) { row++; readFileBean.setPointer(randomAccessFile.getFilePointer()); datas.add(readFileBean.lineScavenge(charsetDecode(line, readFileBean.getReadCharset()))); }