Skip to content

C
chnmuseum-party
Commit ca92d58f authored by liqin's avatar liqin 💬
Browse files
Options

bug fixed

parent a2441f43
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/FileUploadController.java
View file @ ca92d58f
...@@ -175,7 +175,7 @@ public class FileUploadController extends BaseController { ...@@ -175,7 +175,7 @@ public class FileUploadController extends BaseController {
} }
final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl); final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl);
final int crc32 = fileInfo.getCrc32(); final int crc32 = fileInfo.getCrc32();
final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32)); final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32).last(" limit 1"));
final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime() * 1000); final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime() * 1000);
asset.setFileSize(fileInfo.getFileSize()); asset.setFileSize(fileInfo.getFileSize());
...@@ -188,7 +188,6 @@ public class FileUploadController extends BaseController { ...@@ -188,7 +188,6 @@ public class FileUploadController extends BaseController {
if (one != null) { if (one != null) {
FastDFSUtils.deleteFile(fileUrl); FastDFSUtils.deleteFile(fileUrl);
asset.setFileUrl(one.getFileUrl()); asset.setFileUrl(one.getFileUrl());
asset.setCrc32(null);
} }
this.assetService.save(asset); this.assetService.save(asset);
datumUrlList.add(asset); datumUrlList.add(asset);
...@@ -345,7 +344,7 @@ public class FileUploadController extends BaseController { ...@@ -345,7 +344,7 @@ public class FileUploadController extends BaseController {
String fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet); String fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl); final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl);
final int crc32 = fileInfo.getCrc32(); final int crc32 = fileInfo.getCrc32();
final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32)); final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32).last(" limit 1"));
final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime() * 1000); final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime() * 1000);
final long fileSize = fileInfo.getFileSize(); final long fileSize = fileInfo.getFileSize();
final Asset asset = Asset.builder() final Asset asset = Asset.builder()
...@@ -363,7 +362,6 @@ public class FileUploadController extends BaseController { ...@@ -363,7 +362,6 @@ public class FileUploadController extends BaseController {
if (one != null) { if (one != null) {
FastDFSUtils.deleteFile(fileUrl); FastDFSUtils.deleteFile(fileUrl);
asset.setFileUrl(one.getFileUrl()); asset.setFileUrl(one.getFileUrl());
asset.setCrc32(null);
} }
this.assetService.save(asset); this.assetService.save(asset);
fileList.add(asset); fileList.add(asset);
...@@ -482,7 +480,7 @@ public class FileUploadController extends BaseController { ...@@ -482,7 +480,7 @@ public class FileUploadController extends BaseController {
String md5 = fileMetaData.stream().filter(x -> "MD5".equals(x.getName())).map(MetaData::getValue).findFirst().get(); String md5 = fileMetaData.stream().filter(x -> "MD5".equals(x.getName())).map(MetaData::getValue).findFirst().get();
final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl); final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl);
final int crc32 = fileInfo.getCrc32(); final int crc32 = fileInfo.getCrc32();
final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32)); final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32).last(" limit 1"));
final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime() * 1000); final LocalDateTime createTime = TimeUtils.getDateTimeOfTimestamp(fileInfo.getCreateTime() * 1000);
final long fileSize = fileInfo.getFileSize(); final long fileSize = fileInfo.getFileSize();
final Asset asset = Asset.builder() final Asset asset = Asset.builder()
...@@ -501,7 +499,6 @@ public class FileUploadController extends BaseController { ...@@ -501,7 +499,6 @@ public class FileUploadController extends BaseController {
if (one != null) { if (one != null) {
FastDFSUtils.deleteFile(fileUrl); FastDFSUtils.deleteFile(fileUrl);
asset.setFileUrl(one.getFileUrl()); asset.setFileUrl(one.getFileUrl());
asset.setCrc32(null);
} }
this.assetService.save(asset); this.assetService.save(asset);
fileList.add(asset); fileList.add(asset);
...@@ -594,7 +591,7 @@ public class FileUploadController extends BaseController { ...@@ -594,7 +591,7 @@ public class FileUploadController extends BaseController {
String fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet); String fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl); final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl);
final int crc32 = fileInfo.getCrc32(); final int crc32 = fileInfo.getCrc32();
final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32)); final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32).last(" limit 1"));
final long fileSize = fileInfo.getFileSize(); final long fileSize = fileInfo.getFileSize();
final Asset asset = Asset.builder() final Asset asset = Asset.builder()
...@@ -610,7 +607,6 @@ public class FileUploadController extends BaseController { ...@@ -610,7 +607,6 @@ public class FileUploadController extends BaseController {
if (one != null) { if (one != null) {
FastDFSUtils.deleteFile(fileUrl); FastDFSUtils.deleteFile(fileUrl);
asset.setFileUrl(one.getFileUrl()); asset.setFileUrl(one.getFileUrl());
asset.setCrc32(null);
} }
this.assetService.save(asset); this.assetService.save(asset);
fileList.add(asset); fileList.add(asset);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment