From a801a53c2e4eeda9bef2d1416f0ad386c053848e Mon Sep 17 00:00:00 2001 From: zch Date: Sat, 21 Jun 2025 18:10:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor(dms):=20=E9=87=8D=E6=9E=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将文件上传逻辑抽离到单独的方法 handleFileUploads 中 - 优化了文件上传的代码结构,提高了可读性和可维护性 - 在文件上传过程中增加了日志记录和异常处理 --- .../dms/controller/DmsMobileController.java | 38 ++----------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsMobileController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsMobileController.java index d71fc84..cc22a9f 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsMobileController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsMobileController.java @@ -99,7 +99,9 @@ public class DmsMobileController extends BaseController { log.error("文件上传过程中发生未知错误: {}", originalFilename, e); throw new ServiceException("文件上传过程中发生未知错误,请联系管理员。"); } + } + } // 返回上传文件的URL列表 return fileUrls; @@ -192,41 +194,7 @@ public class DmsMobileController extends BaseController { @RepeatSubmit public R insertFaultInstsanceActivity(DmsBillsFaultInstanceBo dmsBillsFaultInstance, List files) { - List fileUrls = new ArrayList<>(); - if(files!=null){ - for (MultipartFile file : files) { - // 从 MultipartFile 中提取 RemoteFileService 所需的参数 - String originalFilename = file.getOriginalFilename(); - String contentType = file.getContentType(); - byte[] fileBytes; - try { - fileBytes = file.getBytes(); - } catch (IOException e) { - log.error("获取文件字节失败: {}", originalFilename, e); - return R.fail("文件获取失败,请重试。"); - } - - try { - // 'name' 参数在当前RemoteFileServiceImpl实现中并非强制决定最终文件名, - // 这里传入originalFilename以保持一致性或作为备用标识 - RemoteFile sysFile = remoteFileService.upload(originalFilename, originalFilename, contentType, fileBytes); - if (sysFile != null && sysFile.getUrl() != null) { - fileUrls.add(sysFile.getUrl()); - } else { - log.warn("文件上传成功但未返回URL或返回数据为空: {}", originalFilename); - // 可以选择返回失败,或继续处理其他文件 - } - } catch (ServiceException e) { - log.error("文件上传服务异常: {}", originalFilename, e); - return R.fail("文件上传服务异常:" + e.getMessage()); - } catch (Exception e) { // 捕获其他未知异常 - log.error("文件上传过程中发生未知错误: {}", originalFilename, e); - return R.fail("文件上传过程中发生未知错误,请联系管理员。"); - } - } - } - - //TODO:文件存储待测试 + List fileUrls = handleFileUploads(files); dmsBillsFaultInstance.setFileUrls(fileUrls); return R.ok(dmsBillsFaultInstanceService.insertByBo(dmsBillsFaultInstance)); }