合并分支 'revert-734f077b' 到 'develop'

efs-ftp/src/main/java/com/zjty/efs/ftp/entity/FileSave.java

@@ -31,8 +31,4 @@ public class FileSave {
     private String path;//文件存储路径
     @ApiModelProperty(name = "fileSize",value = "文件大小",notes = "文件大小",example = "973kb")
     private String fileSize;//文件大小
-    @ApiModelProperty(name = "suffix",value = "文件名后缀",notes = "文件名后缀",example = "png")
-    private String suffix;//文件名后缀
-    @ApiModelProperty(name = "prefix",value = "文件名前缀",notes = "文件名前缀",example = "1")
-    private String prefix;//文件名前缀
 }

efs-ftp/src/main/java/com/zjty/efs/ftp/service/FileUploadService.java

@@ -44,7 +44,7 @@ public interface FileUploadService {
     ServerResponse  merge(List<MergeRequest> uploadRequests);
 
     /**
-     * 扫描仪文件接收
+     * 扫描仪
      * @param httpServletRequest
      * @return
      */

efs-ftp/src/main/java/com/zjty/efs/ftp/service/impl/FileUploadServiceImpl.java

@@ -124,9 +124,10 @@ public class FileUploadServiceImpl implements FileUploadService {
     @Override
     public ServerResponse upload(MultipartFile file, String md5File, Integer chunk) {
         log.info("开始文件上传");
-        log.info("md5File：" + md5File);
-        log.info("当前分片：" + chunk);
-        log.info("文件名称：" + file.getOriginalFilename());
+        log.info("文件：" + file);
+        log.info("md5File" + md5File);
+        log.info("当前分片" + chunk);
+        log.info("文件名称" + file.getOriginalFilename());
         String chunkPath = fileAddress + "/" + md5File + "/";//分片存放目录
         File dirFile = new File(chunkPath);
         if (!dirFile.exists()) {//目录不存在，创建目录
@@ -168,12 +169,7 @@ public class FileUploadServiceImpl implements FileUploadService {
                 fileSave.setPath(savePath);//文件存储地址
                 long size = 0;
                 try {
-                    String realName = new File(savePath).getName();
-                    fileSave.setRealName(realName);
-                    String prefix = realName.substring(0,realName.lastIndexOf("."));
-                    String suffix = realName.substring(realName.lastIndexOf("."));
-                    fileSave.setPrefix(prefix);//文件名前缀
-                    fileSave.setSuffix(suffix);//文件名后缀
+                    fileSave.setRealName(new File(savePath).getName());
                     fileOutputStream = new FileOutputStream(savePath);
                 } catch (FileNotFoundException e) {
                     e.printStackTrace();