From aa1c7114578981463e226d4b2d7773bc1b7994da Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 08 四月 2022 16:57:14 +0800
Subject: [PATCH] ip音柱文件上传

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java |   25 +++++--------------------
 1 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
index 10ac90a..ce53f53 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
@@ -4,23 +4,17 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.sandu.common.domain.ResponseVO;
-import com.sandu.common.enums.FileStorageEnums;
 import com.sandu.common.execption.BusinessException;
-import com.sandu.common.file.FileUploadDto;
 import com.sandu.common.file.impl.LocalFileUploadImpl;
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.IpVolumeFileParam;
-import com.sandu.ximon.admin.param.ReceiveParam;
 import com.sandu.ximon.admin.service.BroadcastV2TaskFileService;
 import com.sandu.ximon.admin.service.FileOperationRecordService;
 import com.sandu.ximon.admin.service.IpVolumeFileService;
 import com.sandu.ximon.dao.domain.BroadcastV2TaskFile;
-import com.sandu.ximon.dao.domain.FileOperationRecord;
 import com.sandu.ximon.dao.domain.IpVolumeFile;
-import com.sandu.ximon.dao.domain.LedSFile;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -43,21 +37,21 @@
     private final LocalFileUploadImpl fileUpload;
 
     @PostMapping("/add")
-    public ResponseVO<Object> addFile(@RequestBody @Validated IpVolumeFileParam fileParam){
+    public ResponseVO<Object> addFile(@RequestBody @Validated IpVolumeFileParam fileParam) {
         return ResponseUtil.success(ipVolumeFileService.addFile(fileParam));
     }
 
     @PostMapping("/delete/{fileId}")
-    public ResponseVO<Object> deleteFile(@PathVariable Long fileId){
+    public ResponseVO<Object> deleteFile(@PathVariable Long fileId) {
         List<BroadcastV2TaskFile> list = v2TaskFileService.list(Wrappers.lambdaQuery(BroadcastV2TaskFile.class).eq(BroadcastV2TaskFile::getFileId, fileId));
-        if(list.size()!=0){
+        if (list.size() != 0) {
             throw new BusinessException("姝ゆ枃浠舵鍦ㄨ鍏朵粬浠诲姟鍗犵敤");
         }
         return ResponseUtil.success(ipVolumeFileService.deleteFile(fileId));
     }
 
     @GetMapping("/list")
-    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword){
+    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
         LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
       /*  if (null != keyword) {
@@ -68,15 +62,6 @@
 
     @PostMapping("/IpVolumeFileUploading")
     public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file) {
-        FileUploadDto fileUploadDto = fileUpload.uploadFile(file);
-
-        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(3);
-        fileOperationRecordService.save(fileOperationRecord);
-        return ResponseUtil.success(fileUploadDto);
+        return ResponseUtil.success(ipVolumeFileService.upload(file));
     }
 }

--
Gitblit v1.9.3