From 245350d2332745fab37ca99021308f4fd15fade1 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 18 Jun 2024 15:50:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A2=98=E8=B5=84=E6=BA=90=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=BC=93=E5=AD=98=E4=BB=A3=E7=90=86=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/SysOssPersonController.java | 24 +++++++++++++++++++ .../system/domain/vo/SysOssResourceVo.java | 20 +++++++++++++++- .../system/service/ISysOssPersonService.java | 9 ++++--- .../impl/SysCatalogResourceServiceImpl.java | 7 +++--- .../service/impl/SysOssPersonServiceImpl.java | 10 ++++++++ 5 files changed, 63 insertions(+), 7 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 53c9a74..5333746 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 @@ -103,4 +103,28 @@ public class SysOssPersonController extends BaseController { @PathVariable Long[] ids) { return toAjax(sysOssPersonService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 复制 + * + * @param bo 主键串 + */ + @SaCheckPermission("file:person:copy") + @Log(title = "【复制我的空间】", businessType = BusinessType.UPDATE) + @PutMapping("/copy") + public R copy(@RequestBody SysOssPersonBo bo) { + return toAjax(sysOssPersonService.copyByBo(bo)); + } + + /** + * 移动 + * + * @param bo 主键串 + */ + @SaCheckPermission("file:person:move") + @Log(title = "【移动我的空间】", businessType = BusinessType.UPDATE) + @PutMapping("/move") + public R move(@RequestBody SysOssPersonBo bo) { + return toAjax(sysOssPersonService.moveByBo(bo)); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java index d73b7af..36001a0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java @@ -2,11 +2,13 @@ package org.dromara.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.system.domain.SysOssResource; import java.io.Serial; import java.io.Serializable; - +import java.util.Date; /** @@ -22,6 +24,7 @@ public class SysOssResourceVo implements Serializable { @Serial private static final long serialVersionUID = 1L; + private Long id; /** * @@ -43,5 +46,20 @@ public class SysOssResourceVo implements Serializable { */ private Integer status; + /** + * 文件后缀名 + */ + private String fileSuffix; + + /** + * 容量 + */ + private String volume; + + private Date createTime; + + @Translation(type = TransConstant.USER_ID_TO_NAME) + private Long createBy; + } 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 4a484d9..dead82c 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,9 +1,9 @@ package org.dromara.system.service; -import org.dromara.system.domain.vo.SysOssPersonVo; -import org.dromara.system.domain.bo.SysOssPersonBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysOssPersonBo; +import org.dromara.system.domain.vo.SysOssPersonVo; import java.util.Collection; import java.util.List; @@ -65,4 +65,7 @@ public interface ISysOssPersonService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + Boolean copyByBo(SysOssPersonBo bo); + Boolean moveByBo(SysOssPersonBo bo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java index af84233..0ca8a75 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java @@ -23,6 +23,7 @@ import org.dromara.system.domain.vo.SysCatalogResourceVo; import org.dromara.system.mapper.SysCatalogResourceMapper; import org.dromara.system.mapper.SysOssResourceMapper; import org.dromara.system.service.ISysCatalogResourceService; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -107,9 +108,9 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService @Override public Boolean updateByBo(SysCatalogResourceBo bo) { SysCatalogResource update = MapstructUtils.convert(bo, SysCatalogResource.class); - SysCatalogResource old = baseMapper.selectById(update.getCatalogId()); + SysCatalogResourceVo old = SpringUtils.getAopProxy(this).selectCatalogById(update.getCatalogId()); if (!old.getParentId().equals(update.getParentId())) { - SysCatalogResource newParentDept = baseMapper.selectById(update.getParentId()); + SysCatalogResourceVo newParentDept = SpringUtils.getAopProxy(this).selectCatalogById(update.getParentId()); if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(old)) { String newAncestors = newParentDept.getAncestors() + StringUtils.SEPARATOR + newParentDept.getCatalogId(); String oldAncestors = old.getAncestors(); @@ -158,7 +159,7 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService return ossResourceMapper.exists(new LambdaQueryWrapper() .eq(SysOssResource::getCatalogId, catalogId)); } - + @Cacheable(cacheNames = CacheNames.SYS_CATALOG_RESOURCE, key = "#catalogId") @Override public SysCatalogResourceVo selectCatalogById(Long catalogId) { return baseMapper.selectVoById(catalogId); 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 4f1bbde..3bc21cd 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 @@ -129,4 +129,14 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService { } return baseMapper.deleteBatchIds(ids) > 0; } + + @Override + public Boolean copyByBo(SysOssPersonBo bo) { + return null; + } + + @Override + public Boolean moveByBo(SysOssPersonBo bo) { + return null; + } }