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()))); }