bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/FileUploadController.java

@@ -114,8 +114,13 @@ public class FileUploadController extends BaseController {
             }
 
             String extName = FilenameUtils.getExtension(originalFilename);
-            boolean anyMatch = Arrays.stream(DATUM_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()));
+            String finalExtName = extName;
+            boolean anyMatch = Arrays.stream(DATUM_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()));
             if (anyMatch) {
+                if ("MPEG".equals(extName.toUpperCase())) {
+                    extName = "mp4";
+                    originalFilename = FilenameUtils.getBaseName(originalFilename) + "." + extName;
+                }
                 final Asset asset = Asset.builder()
                         .fileName(originalFilename)
                         .fileExtName(extName)
@@ -125,7 +130,7 @@ public class FileUploadController extends BaseController {
                 String fileUrl = null;
                 final Set<MetaData> metaDataSet = new HashSet<>();
                 metaDataSet.add(new MetaData("fileName", originalFilename));
-                if (Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()))) {
+                if (Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
                     metaDataSet.add(new MetaData("fileType", FileTypeEnum.VIDEO.name()));
                     handleResult.setFileType(FileTypeEnum.VIDEO.name());
                     asset.setFileType(FileTypeEnum.VIDEO.name());
@@ -133,18 +138,18 @@ public class FileUploadController extends BaseController {
                     final Set<MetaData> fileMetaData = FastDFSUtils.getFileMetaData(fileUrl);
                     String md5 = fileMetaData.stream().filter(x -> "MD5".equals(x.getName())).map(MetaData::getValue).findFirst().get();
                     asset.setMd5(md5);
-                } else if (Arrays.stream(AUDIO_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()))) {
+                } else if (Arrays.stream(AUDIO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
                     metaDataSet.add(new MetaData("fileType", FileTypeEnum.AUDIO.name()));
                     handleResult.setFileType(FileTypeEnum.AUDIO.name());
                     asset.setFileType(FileTypeEnum.AUDIO.name());
                     fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
-                } else if (Arrays.stream(IMAGE_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()))) {
+                } else if (Arrays.stream(IMAGE_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
                     metaDataSet.add(new MetaData("fileType", FileTypeEnum.IMAGE.name()));
                     handleResult.setFileType(FileTypeEnum.IMAGE.name());
                     asset.setFileType(FileTypeEnum.IMAGE.name());
                     fileUrl = FastDFSUtils.uploadFile(file.getInputStream(), file.getSize(), originalFilename, metaDataSet);
                     asset.setThumbnail(fileUrl);
-                } else if (Arrays.stream(DOC_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()))) {
+                } else if (Arrays.stream(DOC_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()))) {
                     metaDataSet.add(new MetaData("fileType", FileTypeEnum.DOCUMENT.name()));
                     handleResult.setFileType(FileTypeEnum.DOCUMENT.name());
                     asset.setFileType(FileTypeEnum.DOCUMENT.name());
@@ -444,10 +449,14 @@ public class FileUploadController extends BaseController {
                 handleList.add(handleResult);
                 continue;
             }
-
             String extName = FilenameUtils.getExtension(originalFilename);
-            boolean anyMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()));
+            String finalExtName = extName;
+            boolean anyMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()));
             if (anyMatch) {
+                if ("MPEG".equals(extName.toUpperCase())) {
+                    extName = "mp4";
+                    originalFilename = FilenameUtils.getBaseName(originalFilename) + "." + extName;
+                }
                 String language = null;
                 final Set<MetaData> metaDataSet = new HashSet<>();
                 metaDataSet.add(new MetaData("fileName", originalFilename));
@@ -571,8 +580,13 @@ public class FileUploadController extends BaseController {
             }
 
             String extName = FilenameUtils.getExtension(originalFilename);
-            boolean anyMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()));
+            String finalExtName = extName;
+            boolean anyMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()));
             if (anyMatch) {
+                if ("MPEG".equals(extName.toUpperCase())) {
+                    extName = "mp4";
+                    originalFilename = FilenameUtils.getBaseName(originalFilename) + "." + extName;
+                }
                 String language = null;
                 final Set<MetaData> metaDataSet = new HashSet<>();
                 metaDataSet.add(new MetaData("fileName", originalFilename));