|
@@ -151,7 +151,6 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|
|
public Integer deleteFiles(List<SysFile> sysFiles) {
|
|
|
Date now = new Date();
|
|
|
sysFiles = sysFiles.stream().peek(s -> {
|
|
|
- s.setDelFlag(1);
|
|
|
s.setActiveFlag(0);
|
|
|
s.setExpriceAt(now);
|
|
|
}).collect(toList());
|
|
@@ -163,7 +162,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|
|
LambdaQueryWrapper<SysFile> queryWrapper = Wrappers.lambdaQuery();
|
|
|
queryWrapper.eq(SysFile::getBatchNo, batchNo);
|
|
|
List<SysFile> sysFileList = list(queryWrapper);
|
|
|
- return this.clearFiles(sysFileList);
|
|
|
+ return this.deleteFiles(sysFileList);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -178,6 +177,9 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
|
|
|
log.error("删除文件失败:"+e);
|
|
|
}
|
|
|
});
|
|
|
- return this.deleteFiles(fileList);
|
|
|
+ fileList = fileList.stream().peek(s -> {
|
|
|
+ s.setDelFlag(1);
|
|
|
+ }).collect(toList());
|
|
|
+ return updateBatchById(fileList) ? fileList.size() : 0;
|
|
|
}
|
|
|
}
|