删除文件接口

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -4,6 +4,7 @@ import com.fdkankan.common.constant.SceneInfoReqType;
 import com.fdkankan.common.controller.BaseController;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.ISceneProService;
+import com.fdkankan.scene.service.ISceneUploadService;
 import com.fdkankan.scene.vo.*;
 import com.fdkankan.common.response.ResultData;
 import java.io.IOException;
@@ -26,6 +27,8 @@ public class SceneEditController extends BaseController {
     private ISceneProService sceneProService;
     @Autowired
     private ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private ISceneUploadService sceneUploadService;
 
     /**
      * <p>
@@ -747,6 +750,31 @@ public class SceneEditController extends BaseController {
         return sceneEditInfoService.uploadBallScreenVideo(num, fileName, file);
     }
 
+    /**
+     * 上传图片到oss,base64
+     * base64   图片base64
+     * fileName  文件名称
+     * bizType  业务类型
+     * files     文件
+     * num 场景码
+     * type 操作类型 0添加，1替换
+     */
+    @RequestMapping(value = "/upload/files", method = RequestMethod.POST)
+    public String uploads(@RequestParam(value = "base64",required = false) String base64,
+        @RequestParam(value = "fileName",required = false) String fileName,
+        @RequestParam(value = "bizType",required = false) String bizType,
+        @RequestParam(value = "files",required = false) MultipartFile[] files,
+        @RequestParam(value = "num",required = false) String num,
+        @RequestParam(value = "type",required = false,defaultValue = "1") Integer type) throws Exception {
+        return sceneUploadService.uploads(base64,fileName,bizType,files,num,type,getToken());
+    }
+
+    @PostMapping("/delete/file")
+    public ResultData delete(@RequestBody @Validated DeleteFileParamVO paramVO) throws Exception{
+        return sceneUploadService.delete(paramVO);
+    }
+
+
 
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneUploadController.java

@@ -2,8 +2,10 @@ package com.fdkankan.scene.controller;
 
 
 import com.fdkankan.common.controller.BaseController;
+import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.service.ISceneUploadService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -11,29 +13,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 @RestController
-@RequestMapping("/api/scene/edit/upload")
+@RequestMapping("/api/scene/edit")
 public class SceneUploadController extends BaseController {
 
-    @Autowired
-    private ISceneUploadService sceneUploadService;
-
-    /**
-     * 上传图片到oss,base64
-     * base64   图片base64
-     * fileName  文件名称
-     * bizType  业务类型
-     * files     文件
-     * num 场景码
-     * type 操作类型 0添加，1替换
-     */
-    @RequestMapping(value = "/files", method = RequestMethod.POST)
-    public String uploads(@RequestParam(value = "base64",required = false) String base64,
-                                     @RequestParam(value = "fileName",required = false) String fileName,
-                                     @RequestParam(value = "bizType",required = false) String bizType,
-                                     @RequestParam(value = "files",required = false) MultipartFile[] files,
-                                     @RequestParam(value = "num",required = false) String num,
-                                     @RequestParam(value = "type",required = false,defaultValue = "1") Integer type) throws Exception {
-        return sceneUploadService.uploads(base64,fileName,bizType,files,num,type,getToken());
-    }
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneUploadService.java

@@ -1,7 +1,9 @@
 package com.fdkankan.scene.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.SceneUpload;
+import com.fdkankan.scene.vo.DeleteFileParamVO;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -15,4 +17,6 @@ import org.springframework.web.multipart.MultipartFile;
 public interface ISceneUploadService extends IService<SceneUpload> {
 
     String uploads(String imgData, String fileName,String blzType,MultipartFile[] files, String sceneCode, Integer type,String token) throws Exception;
+
+    ResultData delete(DeleteFileParamVO param) throws Exception;
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -700,7 +700,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
     @Override
     public DownloadVO downloadBallScreenVideo(BallScreenVideoParamVO param) {
-        String videoPath = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + param.getPlanId() + ".mp4";
+        String videoPath = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + param.getFileName();
         String url = ossUrlPrefix + videoPath + "?t=" + System.currentTimeMillis();
         return DownloadVO.builder()
             .fileName(param.getFileName())

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneUploadServiceImpl.java

@@ -1,18 +1,24 @@
 package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.user.SSOLoginHelper;
 import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.common.util.BASE64DecodedMultipartFile;
 import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.entity.SceneUpload;
 import com.fdkankan.scene.mapper.ISceneUploadMapper;
+import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneUploadService;
+import com.fdkankan.scene.vo.DeleteFileParamVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -73,6 +79,22 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
         return this.uploadFiles(fileName,blzType,multipartFiles,sceneCode,type,userId);
     }
 
+    @Override
+    public ResultData delete(DeleteFileParamVO param) throws Exception {
+
+        String key = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + param.getFileName();
+        uploadToOssUtil.delete(key);
+
+        this.update(new LambdaUpdateWrapper<SceneUpload>()
+            .set(SceneUpload::getTbStatus, TbStatus.DELETE.code())
+            .eq(SceneUpload::getNum, param.getNum())
+            .eq(SceneUpload::getBizType, param.getBizType())
+            .eq(SceneUpload::getFilePath, key)
+            .eq(SceneUpload::getTbStatus, TbStatus.VALID.code()));
+
+        return ResultData.ok();
+    }
+
     public String uploadFiles(String sendFileName,String bizType,List<MultipartFile> files, String sceneCode, Integer type,Long userId) throws Exception{
         if (StringUtils.isEmpty(sceneCode) || files == null || files.size() <= 0 || StringUtils.isEmpty(bizType)) {
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/BallScreenVideoParamVO.java

@@ -14,7 +14,7 @@ import lombok.Data;
 @Data
 public class BallScreenVideoParamVO extends BaseFileParamVO {
 
-    @NotBlank(message = "planId不能为空")
+//    @NotBlank(message = "planId不能为空")
     private String planId;
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/BaseFileParamVO.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.vo;
 
+import javax.validation.constraints.NotBlank;
 import lombok.Data;
 
 /**
@@ -16,11 +17,13 @@ public class BaseFileParamVO {
     /**
      * 场景码
      */
+    @NotBlank(message = "场景码不能为空")
     private String num;
 
     /**
      * 文件名
      */
+    @NotBlank(message = "文件名不能为空")
     private String fileName;
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/DeleteFileParamVO.java

@@ -0,0 +1,23 @@
+package com.fdkankan.scene.vo;
+
+import javax.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/2/23
+ **/
+@Data
+public class DeleteFileParamVO extends BaseFileParamVO{
+
+    @NotBlank(message = "业务类型不能空")
+    private String bizType;
+
+
+
+
+}