扫描仪

efs-ftp/src/main/java/com/zjty/efs/ftp/controller/FileSaveController.java

@@ -28,5 +28,11 @@ public class FileSaveController {
     public ServerResponse findById(@RequestBody List<Integer> idList){
         return fileSaveService.getFiles(idList);
     }
+
+    @GetMapping("/findIdByName")
+    @ResponseBody
+    public ServerResponse findIdByFileName(@RequestParam(value = "fileName") String fileName){
+        return fileSaveService.findIdByName(fileName);
+    }
 }
 

efs-ftp/src/main/java/com/zjty/efs/ftp/controller/FileUploadController.java

@@ -26,11 +26,11 @@ public class FileUploadController {
     @Autowired
     private FileUploadService fileUploadService;
 
-    //文件上传
+    /*//文件上传
     @PutMapping("/upload1")
     public ServerResponse fileUpload(HttpServletRequest httpServletRequest){
         return fileUploadService.fileUpload(httpServletRequest);
-    }
+    }*/
 
    /* *//**
      * @author zs
@@ -90,4 +90,11 @@ public class FileUploadController {
         return fileUploadService.merge(mergeRequests);
     }
 
+    /**
+     * 扫描仪
+     */
+    @PostMapping("/scanner")
+    public ServerResponse scanner(HttpServletRequest httpServletRequest){
+        return fileUploadService.scanner(httpServletRequest);
+    }
 }

efs-ftp/src/main/java/com/zjty/efs/ftp/dao/FileSaveDao.java

@@ -3,6 +3,8 @@ package com.zjty.efs.ftp.dao;
 import com.zjty.efs.ftp.entity.FileSave;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -10,4 +12,7 @@ public interface FileSaveDao extends JpaRepository<FileSave,Integer>, JpaSpecifi
 
     List<FileSave> findByIdIn(List<Integer> idList);
 
+    @Query("select f.id from FileSave f where f.fileName =:fileName")
+    List<Integer> findIdByFileName(@Param("fileName")String fileName);
+
 }

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

@@ -13,4 +13,9 @@ public interface FileSaveService {
      */
     ServerResponse getFiles(List<Integer> idList);
 
+    /**
+     * 根据uuid查询文件id
+     */
+
+    ServerResponse findIdByName(String fileName);
 }

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

@@ -43,4 +43,10 @@ public interface FileUploadService {
      */
     ServerResponse  merge(List<MergeRequest> uploadRequests);
 
+    /**
+     * 扫描仪
+     * @param httpServletRequest
+     * @return
+     */
+    ServerResponse scanner(HttpServletRequest httpServletRequest);
 }

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

@@ -17,4 +17,9 @@ public class FileSaveServiceImpl implements FileSaveService {
     public ServerResponse getFiles(List<Integer> idList) {
         return ServerResponse.success(fileSaveDao.findByIdIn(idList));
     }
+
+    @Override
+    public ServerResponse findIdByName(String fileName) {
+        return ServerResponse.success(fileSaveDao.findIdByFileName(fileName));
+    }
 }

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

@@ -163,9 +163,10 @@ public class FileUploadServiceImpl implements FileUploadService {
                 Integer chunks = mergeRequest.getChunk();
                 String name = mergeRequest.getName();
                 fileSave.setFileName(name);//放入文件名称
-                fileSave.setPath(fileAddress + "/" + name);//文件存储地址
+                //fileSave.setPath(fileAddress + "/" + name);//文件存储地址
                 FileOutputStream fileOutputStream = null;  //合成后的文件
                 String savePath = rename(fileAddress + "/" + name,0);
+                fileSave.setPath(savePath);//文件存储地址
                 long size = 0;
                 try {
                     fileSave.setRealName(new File(savePath).getName());
@@ -211,6 +212,35 @@ public class FileUploadServiceImpl implements FileUploadService {
         return ServerResponse.success(integers);
     }
 
+    @Override
+    public ServerResponse scanner(HttpServletRequest httpServletRequest) {
+        List<FileSave> fileSaves = new ArrayList<>();//文件保存集合
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) httpServletRequest;
+        List<MultipartFile> fileList = multipartRequest.getFiles("file");
+        if(fileList != null && fileList.size() != 0){
+            for(MultipartFile m:fileList){
+                FileSave fileSave = new FileSave();
+                String fileName = m.getOriginalFilename();
+                fileSave.setFileName(fileName);
+                String savePath = rename(fileAddress + "/" + new File(fileName).getName(),0);
+                fileSave.setRealName(new File(savePath).getName());
+                File file = new File(new File(savePath).getAbsolutePath());
+                fileSave.setPath(file.getAbsolutePath());
+                fileSave.setFileSize(fileSize(m.getSize()));
+                fileSaves.add(fileSave);
+                try {
+                    m.transferTo(file);
+                    log.info("扫描文件" + savePath + "保存成功");
+                } catch (IOException e) {
+                    log.error("扫描文件" + savePath + "保存失败");
+                    e.printStackTrace();
+                }
+            }
+        }
+        fileSaveDao.saveAll(fileSaves);
+        return ServerResponse.success();
+    }
+
     /**
      * 名字出现重复，重新命名
      * @param name 文件名称，包括路径