From da823ef0819982dfa74bb0b7a9ce6d534d2fcc2d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 11 三月 2022 15:43:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
sandu-common/src/main/java/com/sandu/common/file/FileUploadDto.java | 4 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java | 3 +++
dao/src/main/java/com/sandu/ximon/dao/domain/FileOperationRecord.java | 5 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 3 +++
4 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/FileOperationRecord.java b/dao/src/main/java/com/sandu/ximon/dao/domain/FileOperationRecord.java
index acb7960..bf095dd 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/FileOperationRecord.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/FileOperationRecord.java
@@ -71,6 +71,11 @@
*/
private Integer dataType;
+ /**
+ * 缂╃暐鍥�
+ */
+ private String screenShot;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/sandu-common/src/main/java/com/sandu/common/file/FileUploadDto.java b/sandu-common/src/main/java/com/sandu/common/file/FileUploadDto.java
index 6c36bef..287b420 100644
--- a/sandu-common/src/main/java/com/sandu/common/file/FileUploadDto.java
+++ b/sandu-common/src/main/java/com/sandu/common/file/FileUploadDto.java
@@ -54,5 +54,9 @@
* 鍥剧墖瀹藉害
*/
private Integer width;
+ /**
+ * 缂╃暐鍥�
+ */
+ private String screenShot;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
index 1dcd277..4453982 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
@@ -57,6 +57,9 @@
@PostMapping("/uploading/{dateType}")
public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file,@PathVariable Integer dateType) {
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
+ if("mp4".equals(fileUploadDto.getFileType())){
+ fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
+ }
FileOperationRecord fileOperationRecord = new FileOperationRecord();
if("mp4".equals(fileUploadDto.getFileType())){
fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
index 64204b4..1eb36b8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
@@ -29,6 +29,9 @@
public boolean addProgramFile(MultipartFile file) {
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
+ if("mp4".equals(fileUploadDto.getFileType())){
+ fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
+ }
FileOperationRecord fileOperationRecord=new FileOperationRecord();
if("mp4".equals(fileUploadDto.getFileType())){
fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
--
Gitblit v1.9.3