|
|
@@ -149,14 +149,14 @@ public class ScannerInfoController extends BaseController {
|
|
|
public AjaxResult claim(@RequestBody ScannerVO obj) {
|
|
|
DocDir dir = dirService.selectDocDirByDirId(obj.getDirId());
|
|
|
Long spaceId = dir.getSpaceId();
|
|
|
- List<String> fileIds = new ArrayList<>();
|
|
|
+ List<Long> fileIds = new ArrayList<>();
|
|
|
if (obj.getMerge()) {
|
|
|
//是否合并为PDF
|
|
|
File f = PdfUtils.imageToPdf(obj.getQ());
|
|
|
if (f != null && f.exists()) {
|
|
|
String name = obj.getName() + ".pdf";
|
|
|
DocInfo info = claimUpload(f, name, spaceId, obj.getDirId());
|
|
|
- fileIds.add(info.getFileId());
|
|
|
+ fileIds.add(info.getDocId());
|
|
|
} else {
|
|
|
return error("文件已被人认领!");
|
|
|
}
|
|
|
@@ -169,7 +169,7 @@ public class ScannerInfoController extends BaseController {
|
|
|
index.getAndIncrement();
|
|
|
name += path.substring(path.lastIndexOf("."));
|
|
|
DocInfo info = claimUpload(f, name, spaceId, obj.getDirId());
|
|
|
- fileIds.add(info.getFileId());
|
|
|
+ fileIds.add(info.getDocId());
|
|
|
});
|
|
|
}
|
|
|
return success(fileIds);
|