|
@@ -91,6 +91,9 @@ public class SmsbMinioDataServiceImpl implements ISmsbMinioDataService {
|
|
|
@Value("${server.minio.bucket}")
|
|
@Value("${server.minio.bucket}")
|
|
|
private String minioServerBucket;
|
|
private String minioServerBucket;
|
|
|
|
|
|
|
|
|
|
+ private static final String PPT_SUFFIX = ".ppt";
|
|
|
|
|
+ private static final String PPTX_SUFFIX = ".pptx";
|
|
|
|
|
+
|
|
|
// 计算目标分辨率(高或宽压缩至480,保持比例)
|
|
// 计算目标分辨率(高或宽压缩至480,保持比例)
|
|
|
private static String calculateResolution(int width, int height) {
|
|
private static String calculateResolution(int width, int height) {
|
|
|
String scaleFilter;
|
|
String scaleFilter;
|
|
@@ -229,9 +232,10 @@ public class SmsbMinioDataServiceImpl implements ISmsbMinioDataService {
|
|
|
case ".jpg", ".jpeg", ".png" -> 1;
|
|
case ".jpg", ".jpeg", ".png" -> 1;
|
|
|
case ".mp4", ".avi" -> 2;
|
|
case ".mp4", ".avi" -> 2;
|
|
|
case ".mp3", ".wav" -> 3;
|
|
case ".mp3", ".wav" -> 3;
|
|
|
|
|
+ case ".ppt", ".pptx" -> 4;
|
|
|
default -> 3;
|
|
default -> 3;
|
|
|
};
|
|
};
|
|
|
- smsbMinioDataBo.setType(boType); // 1图片 2视频 3音频
|
|
|
|
|
|
|
+ smsbMinioDataBo.setType(boType); // 1图片 2视频 3音频 4ppt
|
|
|
smsbMinioDataBo.setTransState(0); // 待转码
|
|
smsbMinioDataBo.setTransState(0); // 待转码
|
|
|
smsbMinioDataBo.setCreateUser(LoginHelper.getLoginUser().getNickname());
|
|
smsbMinioDataBo.setCreateUser(LoginHelper.getLoginUser().getNickname());
|
|
|
return smsbMinioDataBo;
|
|
return smsbMinioDataBo;
|
|
@@ -697,6 +701,10 @@ public class SmsbMinioDataServiceImpl implements ISmsbMinioDataService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private SmsbMinioTransRecord createTransRecord(SmsbMinioData add) {
|
|
private SmsbMinioTransRecord createTransRecord(SmsbMinioData add) {
|
|
|
|
|
+ // 只对图片和视频进行转码
|
|
|
|
|
+ if (add.getType() != 1 && add.getType() != 2) {
|
|
|
|
|
+ return null;
|
|
|
|
|
+ }
|
|
|
SmsbMinioTransRecord transRecord = new SmsbMinioTransRecord();
|
|
SmsbMinioTransRecord transRecord = new SmsbMinioTransRecord();
|
|
|
transRecord.setCreateUser(LoginHelper.getUsername());
|
|
transRecord.setCreateUser(LoginHelper.getUsername());
|
|
|
transRecord.setFileId(add.getId());
|
|
transRecord.setFileId(add.getId());
|
|
@@ -1016,7 +1024,14 @@ public class SmsbMinioDataServiceImpl implements ISmsbMinioDataService {
|
|
|
// 视频码率
|
|
// 视频码率
|
|
|
Integer codeRate = 0;
|
|
Integer codeRate = 0;
|
|
|
// 文件类型
|
|
// 文件类型
|
|
|
- Integer fileType = isImage(file) ? 1 : 2;
|
|
|
|
|
|
|
+ Integer fileType = 0;
|
|
|
|
|
+
|
|
|
|
|
+ if (oss.getFileSuffix().endsWith(PPT_SUFFIX) || oss.getFileSuffix().endsWith(PPTX_SUFFIX)) {
|
|
|
|
|
+ fileType = 4;
|
|
|
|
|
+ }else {
|
|
|
|
|
+ fileType = isImage(file) ? 1 : 2;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
oss.setFileType(fileType);
|
|
oss.setFileType(fileType);
|
|
|
if (fileType == 1) {
|
|
if (fileType == 1) {
|
|
|
resolution = getImageResolution(file);
|
|
resolution = getImageResolution(file);
|