1

src/main/java/com/fdkankan/fusion/common/enums/FileTypeEnum.java

@@ -40,7 +40,7 @@ public enum FileTypeEnum {
         if(StringUtils.isNotBlank(fileType)){
             FileTypeEnum[] values = FileTypeEnum.values();
             for (FileTypeEnum value : values) {
-                if(value.typeList.contains(fileType)){
+                if(value.typeList.contains(fileType.toLowerCase())){
                     return value;
                 }
             }

src/main/java/com/fdkankan/fusion/controller/CaseFusionController.java

@@ -59,6 +59,8 @@ public class CaseFusionController extends BaseController{
     FusionDownService fusionDownService;
     @Autowired
     ICommonUploadService commonUploadService;
+    @Autowired
+    ISceneService sceneService;
 
     @GetMapping("/list")
     public ResultData allList(@RequestParam(required = false) Integer fusionId){
@@ -119,6 +121,10 @@ public class CaseFusionController extends BaseController{
         ScenePlus scenePlus = scenePlusService.getByNum(param.getNum());
         ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
         scenePlus.setScenePlusExt(scenePlusExt);
+        Scene scene = sceneService.getByNum(param.getNum());
+        if(scene !=null){
+            scenePlus.setMapping(scene.getMapping());
+        }
         return ResultData.ok(fusionNumService.add(param,scenePlus,param.getIsObj()));
     }
 

src/main/java/com/fdkankan/fusion/service/impl/CommonUploadServiceImpl.java

@@ -52,9 +52,6 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
     @Autowired
     LocalToOssUtil localToOssUtil;
 
-    @Value("${upload.query-path}")
-    private String ossUrlPrefix;
-    
 
     @Override
     public ResultData uploadFileNew( Integer dictId,MultipartFile file) {
@@ -88,7 +85,7 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
                 throw new BusinessException(ResultCode.FILE_TYPE_ERROR2);
             }
             String format = extName.replace(".", "");
-            CommonUpload commonUpload = commonUploadService.add(name.replace(extName, ""), url, String.valueOf(file.getSize()), uuid, fileTypeEnum, format,format,1,tempFile.getPath(),dictId);
+            CommonUpload commonUpload = commonUploadService.add(name.replace(extName, ""), url, String.valueOf(file.getSize()), uuid, fileTypeEnum, format,format,1,tempFile.getParentFile().getPath(),dictId);
             return ResultData.ok(commonUpload);
         }catch ( BusinessException e){
             log.info("upload-file-error:{}",e);

src/main/java/com/fdkankan/fusion/service/impl/FusionNumServiceImpl.java

@@ -167,7 +167,7 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
             sceneVo.setRtkLocation(scenePlusExt.getRtkLocation());
             sceneVo.setOrientation(scenePlusExt.getOrientation());
         }
-
+        sceneVo.setMapping(scenePlus.getMapping());
         vo.setSceneData(sceneVo);
         return vo;
     }

src/main/java/com/fdkankan/fusion/service/impl/UploadService.java

@@ -109,7 +109,7 @@ public class UploadService {
             FileTypeEnum fileTypeEnum = FileTypeEnum.getByType(format);
 
             commonUploadService.add(fileName.replace(suffixName, ""), MyFileUtils.replaceSeparator(CacheUtil.mapping + ossPath),
-                    String.valueOf(file.getSize()), uuid, fileTypeEnum, format,format,1,localFile.getPath(), null);
+                    String.valueOf(file.getSize()), uuid, fileTypeEnum, format,format,1,localFile.getParentFile().getPath(), null);
             return MyFileUtils.replaceSeparator(CacheUtil.mapping + ossPath);
         }catch (Exception e){
             log.info("upload-error:{}",e);