From 50c343402b334eac202350d7194b7d3ca571ebb3 Mon Sep 17 00:00:00 2001 From: ybb <2532447764@qq.com> Date: Tue, 5 Aug 2025 09:27:10 +0800 Subject: [PATCH] =?UTF-8?q?7-31=20=E5=B2=97=E4=BD=8D=E6=9F=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../znpt/mapper/BusinessDataFileMapper.java | 2 +- .../znpt/service/BusinessDataFileService.java | 2 +- .../impl/BusinessDataFileServiceImpl.java | 9 +++--- .../mapper/BusinessDataFileMapper.xml | 18 +++++------ .../BusinessDataFileController.java | 31 ++++++++++--------- 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java b/core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java index 789e09d..e35c179 100644 --- a/core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java +++ b/core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java @@ -11,7 +11,7 @@ import java.util.List; @ApiOperation("商务资料文件对象") public interface BusinessDataFileMapper { - public List List( @Param("folderId") Long folderId,String fileName); + public List List(@Param("folderId") Long folderId, @Param("fileName") String fileName); void delete(@Param("fileId") Long fileId,@Param("folderId") Long folderId); void add(BusinessDataFileEntity businessDataFileEntity); diff --git a/core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java b/core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java index ca09adb..2edabea 100644 --- a/core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java +++ b/core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam; public interface BusinessDataFileService { - PageBean pageSelect(Integer page, Integer pageSize, Long folderId); + PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName); Result delete(@RequestParam(value = "fileId", required = false) Long fileId,@RequestParam(value = "foldelId", required = false) Long folderId); diff --git a/core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java index eac6aae..5f6198b 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java @@ -30,11 +30,12 @@ public class BusinessDataFileServiceImpl implements BusinessDataFileService { @ApiOperation("分页查询文件") - public PageBean pageSelect(Integer page, Integer pageSize, Long folderId) { + @Override + public PageBean pageSelect(Integer page, Integer pageSize, Long folderId, String fileName) { PageHelper.startPage(page, pageSize); - List list = businessDataFileMapper.List(folderId ,""); - Page p= (Page) list; - PageBean pageBean = new PageBean(p.getTotal(),p.getResult()); + List list = businessDataFileMapper.List(folderId, fileName); + Page p = (Page) list; + PageBean pageBean = new PageBean(p.getTotal(), p.getResult()); return pageBean; } @ApiOperation("删除文件") diff --git a/core/src/main/resources/mapper/BusinessDataFileMapper.xml b/core/src/main/resources/mapper/BusinessDataFileMapper.xml index 9e15fff..f7f3b44 100644 --- a/core/src/main/resources/mapper/BusinessDataFileMapper.xml +++ b/core/src/main/resources/mapper/BusinessDataFileMapper.xml @@ -2,15 +2,15 @@ delete from business_data_part_file diff --git a/web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java b/web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java index 8606122..09df174 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java @@ -44,43 +44,44 @@ public class BusinessDataFileController { @ApiOperation(value = "分页查询文件", httpMethod = "GET") @GetMapping("/list") public Result pageSelect(@RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer pageSize, - @RequestParam(defaultValue = "0") Long folderId) { - PageBean pageBean = businessDataFileService.pageSelect(page, pageSize, folderId); + @RequestParam(defaultValue = "10") Integer pageSize, + @RequestParam(defaultValue = "0") Long folderId, + @RequestParam(required = false) String fileName) { + PageBean pageBean = businessDataFileService.pageSelect(page, pageSize, folderId, fileName); return Result.ok(pageBean); } @ApiOperation(value = "增加文件") @PostMapping("/add") public Result add(@RequestParam("file") MultipartFile file, - @RequestParam Long folderId) { - System.out.println(file+" 77777777777777777777777777"+folderId); + @RequestParam Long folderId) { + System.out.println(file + " 77777777777777777777777777" + folderId); if (file.isEmpty()) { return Result.error("上传文件为空"); } - //TODO 以后可以优化，就算文件名一样，加个（1），（2）这种 + // TODO 以后可以优化，就算文件名一样，加个（1），（2）这种 try { byte[] bytes = file.getBytes(); String uploadDir = businessDataService.getPath(folderId); File uploadedFile = new File(uploadDir + "\\" + file.getOriginalFilename()); - if(uploadedFile.exists()){ + if (uploadedFile.exists()) { return Result.error("文件已存在"); - } + } file.transferTo(uploadedFile); - //保存文件信息到数据 + // 保存文件信息到数据 BusinessDataFileEntity fileEntity = new BusinessDataFileEntity(); fileEntity.setFolderId(folderId); fileEntity.setFileName(file.getOriginalFilename()); - fileEntity.setFilePath(uploadDir+"\\"+file.getOriginalFilename()); + fileEntity.setFilePath(uploadDir + "\\" + file.getOriginalFilename()); fileEntity.setFileType(file.getContentType()); fileEntity.setFileSize(file.getSize()); - fileEntity.setUploadTime(new Date() ); + fileEntity.setUploadTime(new Date()); fileEntity.setUploaderId(0L); - System.out.println(uploadDir+"\\"+file.getOriginalFilename()); + System.out.println(uploadDir + "\\" + file.getOriginalFilename()); businessDataFileService.add(fileEntity); return Result.okM("上传成功"); @@ -93,12 +94,13 @@ public class BusinessDataFileController { @ApiOperation(value = "删除文件") @DeleteMapping("/delete") public Result delete(@RequestParam Long fileId) { - businessDataFileService.delete(fileId,null); + businessDataFileService.delete(fileId, null); return Result.okM("删除成功"); } + @ApiOperation(value = "下载文件") @GetMapping("/download") - public void download(@RequestParam("fileId") Long fileId , HttpServletResponse response) { + public void download(@RequestParam("fileId") Long fileId, HttpServletResponse response) { String path = businessDataFileService.getPath(fileId); try { // path是指想要下载的文件的路径 @@ -133,5 +135,4 @@ public class BusinessDataFileController { } } - }