|
@@ -61,27 +61,27 @@ public class ProcessExecutorServiceImpl extends ServiceImpl<ProcessExecutorMappe
|
|
|
@SneakyThrows
|
|
|
@Override
|
|
|
public void invoke(Map<Integer, Object> obj, AnalysisContext context) {
|
|
|
+ int nowIndex = context.readRowHolder().getRowIndex();
|
|
|
System.out.println("当前行数" + context.readRowHolder().getRowIndex());
|
|
|
- if (null != inData.getReadRowNum() && inData.getReadRowNum().equals(context.readRowHolder().getRowIndex() - 1)) {
|
|
|
- for (Integer key : obj.keySet()) {
|
|
|
- obj.computeIfAbsent(key, k -> "缺失列名" + k);
|
|
|
+ if (nowIndex >= inData.getMinRowNum() - 1) {
|
|
|
+ if (null != inData.getReadRowNum() && inData.getReadRowNum().equals(context.readRowHolder().getRowIndex() - 1)) {
|
|
|
+ for (Integer key : obj.keySet()) {
|
|
|
+ obj.computeIfAbsent(key, k -> "缺失列名" + k);
|
|
|
+ }
|
|
|
+ data.add(obj);
|
|
|
+ } else {
|
|
|
+ for (Integer key : obj.keySet()) {
|
|
|
+ obj.computeIfAbsent(key, k -> "缺失列名" + (k + 1));
|
|
|
+ }
|
|
|
+ data.add(obj);
|
|
|
}
|
|
|
- data.add(obj);
|
|
|
- } else {
|
|
|
- for (Integer key : obj.keySet()) {
|
|
|
- obj.computeIfAbsent(key, k -> "缺失列名" + (k + 1));
|
|
|
- }
|
|
|
- data.add(obj);
|
|
|
}
|
|
|
- System.out.println(obj);
|
|
|
-// obj.put(-2, "文件名");
|
|
|
-// obj.put(-1, context.readSheetHolder().getSheetName());
|
|
|
-// obj.put(-1, "sheet名称");
|
|
|
+ System.out.println("当前行数小于开始行数" + inData.getMinRowNum() + "已跳过");
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public boolean hasNext(AnalysisContext context) {
|
|
|
- if (context.readRowHolder().getRowIndex() > inData.getReadRowCount() - 1) {
|
|
|
+ if (context.readRowHolder().getRowIndex() >= inData.getMaxRowNum() - 1) {
|
|
|
return false;
|
|
|
}
|
|
|
|