From ab060213fe5b62ba8bf9b87c8a93ba7e9fea05db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期六, 02 四月 2022 11:39:01 +0800
Subject: [PATCH] 单灯数据导出
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
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 010af57..014cf2b 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
@@ -3,16 +3,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.param.LEDProgramFileParam;
-import com.sandu.ximon.admin.service.LEDProgramFileService;
+import com.sandu.ximon.admin.service.FileOperationRecordService;
import com.sandu.ximon.admin.service.LedSFileService;
-import com.sandu.ximon.dao.domain.LEDProgramFile;
+import com.sandu.ximon.dao.domain.FileOperationRecord;
+import com.sandu.ximon.dao.domain.LedSFile;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
+import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -24,21 +25,21 @@
@Slf4j
@RestController
@AllArgsConstructor
-@RequestMapping("/v1/file")
+@RequestMapping("/v1/xixun/file")
public class LedSFileController {
private final LedSFileService ledProgramFileService;
private final AliOssFileServiceImpl aliOssFileService;
+ private final FileOperationRecordService fileOperationRecordService;
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestParam("file") MultipartFile file) {
-
- //return ResponseUtil.success(ledProgramFileService.addProgramFile(file));
- return ResponseUtil.success(aliOssFileService.uploadFile(file));
+ return ResponseUtil.success(ledProgramFileService.addProgramFile(file));
+// return ResponseUtil.success(aliOssFileService.uploadFile(file));
}
- /* @PostMapping("/delete/{fileId}")
+ @PostMapping("/delete/{fileId}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long fileId) {
return ResponseUtil.success(ledProgramFileService.deleteFile(fileId));
}
@@ -46,10 +47,27 @@
@GetMapping("/list")
public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
+ LambdaQueryWrapper<LedSFile> wrapper = ledProgramFileService.listFile();
if (null != keyword) {
- wrapper.like(LEDProgramFile::getName, keyword);
+ wrapper.like(LedSFile::getOriginName, keyword);
}
- return ResponseUtil.successPage(ledProgramFileService.list(wrapper));
- }*/
+ return ResponseUtil.success(ledProgramFileService.list(wrapper));
+ }
+
+ @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");
+// }
+ BeanUtils.copyProperties(fileUploadDto, fileOperationRecord);
+ fileOperationRecord.setDataType(dateType);
+ fileOperationRecordService.save(fileOperationRecord);
+ return ResponseUtil.success(fileUploadDto);
+ }
+
}
--
Gitblit v1.9.3