下载使用原版
This commit is contained in:
parent
9bff9d672e
commit
1ad8dec41e
|
@ -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<String> 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);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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<String> 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")
|
||||
|
|
|
@ -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<String> 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")
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue