From 1ad8dec41e71ae8fb6e82dc746157f36f00b46bb Mon Sep 17 00:00:00 2001 From: cjw Date: Thu, 27 Jun 2024 16:31:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BD=BF=E7=94=A8=E5=8E=9F?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/file/SysOssPersonController.java | 5 +++-- .../system/controller/file/SysOssResourceController.java | 5 +++-- .../system/controller/file/SysOssTextbookController.java | 5 +++-- .../org/dromara/system/service/ISysOssPersonService.java | 3 ++- .../org/dromara/system/service/ISysOssResourceService.java | 3 ++- .../org/dromara/system/service/ISysOssTextbookService.java | 3 ++- .../system/service/impl/SysOssPersonServiceImpl.java | 6 ++++-- .../system/service/impl/SysOssResourceServiceImpl.java | 6 ++++-- .../system/service/impl/SysOssTextbookServiceImpl.java | 6 ++++-- 9 files changed, 27 insertions(+), 15 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java index 3897460..2faba4c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java @@ -1,6 +1,7 @@ package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; @@ -111,8 +112,8 @@ public class SysOssPersonController extends BaseController { */ @SaCheckPermission("file:person:download") @PostMapping("/download/{id}") - public R download(@NotNull(message = "主键不能为空") @PathVariable Long id) throws Exception { - return R.ok("操作成功",sysOssPersonService.download(id)); + public void download(@NotNull(message = "主键不能为空") @PathVariable Long id, HttpServletResponse response) throws Exception { + sysOssPersonService.download(id,response); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java index f01fa1a..833c666 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java @@ -1,6 +1,7 @@ package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; @@ -130,8 +131,8 @@ public class SysOssResourceController extends BaseController { */ @SaCheckPermission("file:resource:download") @PostMapping("/download/{id}") - public R download(@NotNull(message = "主键不能为空") @PathVariable Long id) throws Exception { - return R.ok("操作成功",sysOssResourceService.download(id)); + public void download(@NotNull(message = "主键不能为空") @PathVariable Long id ,HttpServletResponse response) throws Exception { + sysOssResourceService.download(id,response); } @SaCheckPermission("file:resource:preview") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java index ffda49f..48725be 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java @@ -1,6 +1,7 @@ package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; @@ -132,8 +133,8 @@ public class SysOssTextbookController extends BaseController { */ @SaCheckPermission("file:textbook:download") @PostMapping("/download/{id}") - public R download(@NotNull(message = "主键不能为空") @PathVariable Long id) throws Exception { - return R.ok("操作成功",sysOssTextbookService.download(id)); + public void download(@NotNull(message = "主键不能为空") @PathVariable Long id, HttpServletResponse response) throws Exception { + sysOssTextbookService.download(id,response); } @SaCheckPermission("file:textbook:preview") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssPersonService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssPersonService.java index d6ef1e0..b305aee 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssPersonService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssPersonService.java @@ -1,5 +1,6 @@ package org.dromara.system.service; +import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.system.domain.bo.SysOssPersonBo; @@ -69,6 +70,6 @@ public interface ISysOssPersonService { Boolean copyByBo(SysOssPersonBo bo); Boolean moveByBo(SysOssPersonBo bo); - String download(Long id); + void download(Long id,HttpServletResponse response) throws Exception; String preview(Long id); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java index 5d03fa0..c7c5a14 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java @@ -1,6 +1,7 @@ package org.dromara.system.service; +import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.system.domain.bo.SysOssResourceBo; @@ -82,7 +83,7 @@ public interface ISysOssResourceService { Boolean moveByBo(SysOssResourceBo bo); - String download(Long id); + void download(Long id, HttpServletResponse response) throws Exception; String preview(Long id); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java index 33baf70..08b98c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java @@ -1,6 +1,7 @@ package org.dromara.system.service; +import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.system.domain.bo.SysOssTextbookBo; @@ -80,7 +81,7 @@ public interface ISysOssTextbookService { Boolean copyByBo(SysOssTextbookBo bo); Boolean moveByBo(SysOssTextbookBo bo); - String download(Long id); + void download(Long id, HttpServletResponse response) throws Exception; String preview(Long id); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java index 9a1b27e..f365a5e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; @@ -205,9 +206,10 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService { } @Override - public String download(Long id) { + public void download(Long id, HttpServletResponse response) throws Exception{ SysOssPerson ossPerson = baseMapper.selectById(id); - return ossService.getUrlById(ossPerson.getOssId()); + String fileName = ossPerson.getFileName(); + ossService.download(ossPerson.getOssId(), fileName, response); } @Override diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java index 60c2e20..95ebe3e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; @@ -252,10 +253,11 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService { } @Override - public String download(Long id) { + public void download(Long id, HttpServletResponse response)throws Exception { SysOssResource ossResource = baseMapper.selectById(id); + String fileName = ossResource.getFileName(); + ossService.download(ossResource.getOssId(), fileName, response); baseMapper.addDownloadNum(id); - return ossService.getUrlById(ossResource.getOssId()); } @Override diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java index b2137ef..422a4c8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; @@ -263,10 +264,11 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { } @Override - public String download(Long id) { + public void download(Long id, HttpServletResponse response) throws Exception { SysOssTextbook ossTextbook = baseMapper.selectById(id); + String fileName = ossTextbook.getFileName(); + ossService.download(ossTextbook.getOssId(), fileName, response); baseMapper.addDownloadNum(id); - return ossService.getUrlById(ossTextbook.getOssId()); } @Override