Procházet zdrojové kódy

增加 支持insta360相机

dengsixing před 7 měsíci
rodič
revize
0f7a6cc088

+ 2 - 2
src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -96,8 +96,8 @@ public class SceneFileController{
      */
     @PostMapping("upload")
     public ResultData upload(@RequestParam(value = "file",required = false) MultipartFile file,
-                             String params) throws Exception {
-        return sceneFileBuildService.uploadFile(file, params);
+                             String params, @RequestParam(value = "dir", defaultValue = "") String dir) throws Exception {
+        return sceneFileBuildService.uploadFile(file, params, dir);
     }
 
     /**

+ 1 - 1
src/main/java/com/fdkankan/contro/service/ISceneFileBuildService.java

@@ -30,7 +30,7 @@ public interface ISceneFileBuildService extends IService<SceneFileBuild> {
 
     ResultData copyDataAndBuild(String sourceBucet,String dataSource,String sceneVer) throws Exception;
 
-    ResultData uploadFile(MultipartFile file, String params) throws Exception;
+    ResultData uploadFile(MultipartFile file, String params, String dir) throws Exception;
 
     ResultData uploadLiguang(String num, String snCode, String ossPath) throws Exception;
 

+ 2 - 2
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1901,7 +1901,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     }
 
     @Override
-    public ResultData uploadFile(MultipartFile file, String params) throws Exception {
+    public ResultData uploadFile(MultipartFile file, String params, String dir) throws Exception {
 
         String uuid = UUID.randomUUID().toString();
         log.info("upload-params: "+params);
@@ -1978,7 +1978,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         String filePath = mac.concat(File.separator).concat(fileId).concat(File.separator).concat(folderName);
 
         String yunFilePath = LocalConstants.BASE_PATH.concat(fYunFileConfig.getBucket()).concat(File.separator).concat(ConstantFilePath.OSS_PREFIX)
-                .concat(filePath).concat(File.separator).concat(fileName);
+                .concat(filePath).concat(File.separator).concat(dir).concat(fileName);
         log.info("yunFilePath:{}", yunFilePath);
 
         Map<String, Object> map = new HashMap<>();