mozhe
/
school-file-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
jiangzhe 2024-06-19 14:12:33 +08:00
parent 4ba8064b64 7ccc5d4dfb
commit de11772200
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
View File

@ -66,7 +66,7 @@ public interface ISysOssService {
* @param ossId OSS对象ID * @param ossId OSS对象ID
* @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容
*/ */
void download(Long ossId, HttpServletResponse response) throws IOException; void download(Long ossId,String originalName,HttpServletResponse response) throws IOException;
/** /**
* 删除OSS对象存储 * 删除OSS对象存储

6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
View File

@ -291,7 +291,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
@Caching(evict = { @Caching(evict = {
@CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#bo.deptId"), @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#bo.deptId"),
@CacheEvict(cacheNames = CacheNames.SYS_TENANT_DEPT, key = "all") @CacheEvict(cacheNames = CacheNames.SYS_TENANT_DEPT, allEntries = true)
}) })
@Override @Override
public int updateDept(SysDeptBo bo) { public int updateDept(SysDeptBo bo) {
@ -362,14 +362,14 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
*/ */
@Caching(evict = { @Caching(evict = {
@CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#deptId"), @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#deptId"),
@CacheEvict(cacheNames = CacheNames.SYS_TENANT_DEPT, key = "all") @CacheEvict(cacheNames = CacheNames.SYS_TENANT_DEPT, allEntries = true)
}) })
@Override @Override
public int deleteDeptById(Long deptId) { public int deleteDeptById(Long deptId) {
return baseMapper.deleteById(deptId); return baseMapper.deleteById(deptId);
} }
@Cacheable(cacheNames = CacheNames.SYS_TENANT_DEPT, key = "all") @Cacheable(cacheNames = CacheNames.SYS_TENANT_DEPT)
@Override @Override
public List<SysDept> selectAllDept() { public List<SysDept> selectAllDept() {
return baseMapper.selectList(); return baseMapper.selectList();

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java
View File

@ -190,6 +190,7 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService {
@Override @Override
public void download(Long id, HttpServletResponse response) throws IOException { public void download(Long id, HttpServletResponse response) throws IOException {
SysOssPerson ossPerson = baseMapper.selectById(id); SysOssPerson ossPerson = baseMapper.selectById(id);
ossService.download(ossPerson.getOssId(), response); String fileName = ossPerson.getFileName();
ossService.download(ossPerson.getOssId(), fileName, response);
} }
} }

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java
View File

@ -209,7 +209,8 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService {
@Override @Override
public void download(Long id, HttpServletResponse response) throws IOException { public void download(Long id, HttpServletResponse response) throws IOException {
SysOssResource ossResource = baseMapper.selectById(id); SysOssResource ossResource = baseMapper.selectById(id);
ossService.download(ossResource.getOssId(), response); String fileName = ossResource.getFileName();
ossService.download(ossResource.getOssId(), fileName, response);
baseMapper.addDownloadNum(id); baseMapper.addDownloadNum(id);
} }
} }

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
View File

@ -169,12 +169,12 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
* @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容
*/ */
@Override @Override
public void download(Long ossId, HttpServletResponse response) throws IOException { public void download(Long ossId,String originalName, HttpServletResponse response) throws IOException {
SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId);
if (ObjectUtil.isNull(sysOss)) { if (ObjectUtil.isNull(sysOss)) {
throw new ServiceException("文件数据不存在!"); throw new ServiceException("文件数据不存在!");
} }
FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); FileUtils.setAttachmentResponseHeader(response, originalName);
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
OssClient storage = OssFactory.instance(sysOss.getService()); OssClient storage = OssFactory.instance(sysOss.getService());
long contentLength = storage.download(sysOss.getFileName(), response.getOutputStream()); long contentLength = storage.download(sysOss.getFileName(), response.getOutputStream());

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java
View File

@ -209,7 +209,8 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
@Override @Override
public void download(Long id, HttpServletResponse response) throws IOException { public void download(Long id, HttpServletResponse response) throws IOException {
SysOssTextbook ossTextbook = baseMapper.selectById(id); SysOssTextbook ossTextbook = baseMapper.selectById(id);
ossService.download(ossTextbook.getOssId(), response); String fileName = ossTextbook.getFileName();
ossService.download(ossTextbook.getOssId(), fileName, response);
baseMapper.addDownloadNum(id); baseMapper.addDownloadNum(id);
} }
} }