|
|
@@ -21,6 +21,7 @@ import vip.xiaonuo.disk.util.PdfUtils;
|
|
|
import vip.xiaonuo.disk.util.VideoConverter;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
@@ -265,7 +266,7 @@ public class TranscodingServiceImpl implements TranscodingService {
|
|
|
if(videoList.contains(userFile.getExtendName())||wordList.contains(userFile.getExtendName())){
|
|
|
newFile = new ResourceFile();
|
|
|
newFile.setFileId(fileBean.getFileId());
|
|
|
- newFile.setPreviewFileUrl("converted/" + fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
|
|
|
+ newFile.setPreviewFileUrl("converted/" + getCurrentDate()+"/"+fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
|
|
|
resourceFileMapper.updateById(newFile);
|
|
|
}
|
|
|
} catch (Exception ex) {
|
|
|
@@ -289,7 +290,7 @@ public class TranscodingServiceImpl implements TranscodingService {
|
|
|
newFile = new ResourceFile();
|
|
|
newFile.setFileId(fileBean.getFileId());
|
|
|
if(videoList.contains(userFile.getExtendName())||wordList.contains(userFile.getExtendName())){
|
|
|
- newFile.setPreviewFileUrl("converted/" + fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
|
|
|
+ newFile.setPreviewFileUrl("converted/" +getCurrentDate()+"/"+fileBean.getFileId() + "." + transcodingResourceReqDTO.getFormat());
|
|
|
}else{
|
|
|
newFile.setPreviewFileUrl(fileBean.getFileUrl());
|
|
|
}
|
|
|
@@ -304,7 +305,7 @@ public class TranscodingServiceImpl implements TranscodingService {
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- newFile = new ResourceFile();
|
|
|
+ newFile = new ResourceFile();
|
|
|
newFile.setFileId(fileBean.getFileId());
|
|
|
newFile.setPreviewFileUrl(fileBean.getFileUrl());
|
|
|
resourceFileMapper.updateById(newFile);
|
|
|
@@ -317,6 +318,14 @@ public class TranscodingServiceImpl implements TranscodingService {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ public String getCurrentDate() {
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
|
|
|
+ String currentDate = sdf.format(new Date());
|
|
|
+ return currentDate;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
private void insertResourceUserfileConvert(String userFileId, String fileId, String fileName, String extendName,String filePath,String status,String userId,String reason) {
|
|
|
ResourceUserfileConvert resourceUserfileConvert=new ResourceUserfileConvert();
|
|
|
resourceUserfileConvert.setUserFileId(userFileId);
|