Commit d0da9421 authored by liqin's avatar liqin 💬

bug fixed

parent a56b38ac
package cn.chnmuseum.party.model; package cn.chnmuseum.party.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -62,9 +61,8 @@ public class Asset implements Serializable { ...@@ -62,9 +61,8 @@ public class Asset implements Serializable {
@TableField("file_cat") @TableField("file_cat")
private String fileCat; private String fileCat;
@ApiModelProperty(hidden = true) @ApiModelProperty("下载链接")
@TableField("file_url") @TableField("file_url")
@JSONField(serialize = false)
private String fileUrl; private String fileUrl;
@ApiModelProperty("Base64加密链接") @ApiModelProperty("Base64加密链接")
......
...@@ -177,39 +177,39 @@ public class FileUploadController extends BaseController { ...@@ -177,39 +177,39 @@ 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();
asset.setMd5(md5); asset.setMd5(md5);
asset.setIntro(Base64.getEncoder().encodeToString(fileUrl.getBytes())); asset.setIntro(Base64.getEncoder().encodeToString(fileUrl.getBytes()));
asset.setFileUrlCrypto(md5 + ".chnmuseum"); asset.setFileNameCrypto(md5 + ".chnmuseum");
asset.setFileUrlCrypto(fileUrlCrypto);
} else if (Arrays.stream(AUDIO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) { } else if (Arrays.stream(AUDIO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
metaDataSet.add(new MetaData("fileType", FileTypeEnum.AUDIO.name())); metaDataSet.add(new MetaData("fileType", FileTypeEnum.AUDIO.name()));
handleResult.setFileType(FileTypeEnum.AUDIO.name()); handleResult.setFileType(FileTypeEnum.AUDIO.name());
asset.setFileType(FileTypeEnum.AUDIO.name()); asset.setFileType(FileTypeEnum.AUDIO.name());
fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet); fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
asset.setFileUrl(fileUrl);
} else if (Arrays.stream(IMAGE_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) { } else if (Arrays.stream(IMAGE_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
metaDataSet.add(new MetaData("fileType", FileTypeEnum.IMAGE.name())); metaDataSet.add(new MetaData("fileType", FileTypeEnum.IMAGE.name()));
handleResult.setFileType(FileTypeEnum.IMAGE.name()); handleResult.setFileType(FileTypeEnum.IMAGE.name());
asset.setFileType(FileTypeEnum.IMAGE.name()); asset.setFileType(FileTypeEnum.IMAGE.name());
fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet); fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
asset.setThumbnail(fileUrl); asset.setThumbnail(fileUrl);
asset.setFileUrl(fileUrl);
} else if (Arrays.stream(DOC_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) { } else if (Arrays.stream(DOC_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
metaDataSet.add(new MetaData("fileType", FileTypeEnum.DOCUMENT.name())); metaDataSet.add(new MetaData("fileType", FileTypeEnum.DOCUMENT.name()));
handleResult.setFileType(FileTypeEnum.DOCUMENT.name()); handleResult.setFileType(FileTypeEnum.DOCUMENT.name());
asset.setFileType(FileTypeEnum.DOCUMENT.name()); asset.setFileType(FileTypeEnum.DOCUMENT.name());
fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet); fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
asset.setFileUrl(fileUrl);
} }
final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl); final FileInfo fileInfo = FastDFSUtils.getFileInfo(fileUrl);
final int crc32 = fileInfo.getCrc32();
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());
asset.setFileUrl(fileUrl);
asset.setFileUrlCrypto(fileUrlCrypto);
asset.setFileCat(FileCatEnum.EXHIBITION_BOARD_DATUM.name()); asset.setFileCat(FileCatEnum.EXHIBITION_BOARD_DATUM.name());
asset.setLanguage(language); asset.setLanguage(language);
if (Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
asset.setCrc32((long) crc32);
}
asset.setCreateTime(createTime); asset.setCreateTime(createTime);
asset.setUpdateTime(createTime); asset.setUpdateTime(createTime);
if (Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
final int crc32 = fileInfo.getCrc32();
final Asset one = this.assetService.getOne(Wrappers.<Asset>lambdaQuery().eq(Asset::getCrc32, (long) crc32).last(" limit 1"));
asset.setCrc32((long) crc32);
if (one != null) { if (one != null) {
try { try {
FastDFSUtils.deleteFile(fileUrl); FastDFSUtils.deleteFile(fileUrl);
...@@ -219,9 +219,11 @@ public class FileUploadController extends BaseController { ...@@ -219,9 +219,11 @@ public class FileUploadController extends BaseController {
asset.setFileUrl(one.getFileUrl()); asset.setFileUrl(one.getFileUrl());
asset.setIntro(one.getIntro()); asset.setIntro(one.getIntro());
asset.setFileUrlCrypto(one.getFileUrlCrypto()); asset.setFileUrlCrypto(one.getFileUrlCrypto());
asset.setFileNameCrypto(one.getFileNameCrypto());
asset.setMd5(one.getMd5()); asset.setMd5(one.getMd5());
asset.setCrc32(one.getCrc32()); asset.setCrc32(one.getCrc32());
} }
}
this.assetService.save(asset); this.assetService.save(asset);
datumUrlList.add(asset); datumUrlList.add(asset);
...@@ -561,7 +563,6 @@ public class FileUploadController extends BaseController { ...@@ -561,7 +563,6 @@ public class FileUploadController extends BaseController {
.fileExtName(extName) .fileExtName(extName)
.fileType(FileTypeEnum.VIDEO.name()) .fileType(FileTypeEnum.VIDEO.name())
.fileSize(fileSize) .fileSize(fileSize)
.fileUrl(fileUrl)
.intro(Base64.getEncoder().encodeToString(fileUrl.getBytes())) .intro(Base64.getEncoder().encodeToString(fileUrl.getBytes()))
.fileUrlCrypto(fileUrlCrypto) .fileUrlCrypto(fileUrlCrypto)
.fileCat(FileCatEnum.VIDEO_CONTENT.name()) .fileCat(FileCatEnum.VIDEO_CONTENT.name())
...@@ -575,9 +576,9 @@ public class FileUploadController extends BaseController { ...@@ -575,9 +576,9 @@ public class FileUploadController extends BaseController {
if (one != null) { if (one != null) {
FastDFSUtils.deleteFile(fileUrl); FastDFSUtils.deleteFile(fileUrl);
FastDFSUtils.deleteFile(fileUrlCrypto); FastDFSUtils.deleteFile(fileUrlCrypto);
asset.setFileUrl(one.getFileUrl());
asset.setIntro(one.getIntro()); asset.setIntro(one.getIntro());
asset.setFileUrlCrypto(one.getFileUrlCrypto()); asset.setFileUrlCrypto(one.getFileUrlCrypto());
asset.setFileNameCrypto(one.getFileNameCrypto());
asset.setMd5(one.getMd5()); asset.setMd5(one.getMd5());
asset.setCrc32(one.getCrc32()); asset.setCrc32(one.getCrc32());
} }
......
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