From a786d1b81a38efffdfa18e296526aa043f99cb45 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 26 Jun 2024 11:20:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=A9=BA=E9=97=B4=E5=AE=B9?= =?UTF-8?q?=E9=87=8F=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/system/domain/vo/SysOssVolumeVo.java | 2 ++ .../dromara/system/service/impl/SysOssServiceImpl.java | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVolumeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVolumeVo.java index 45234e8..3f5872b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVolumeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVolumeVo.java @@ -36,9 +36,11 @@ public class SysOssVolumeVo implements Serializable { * 总大小 */ private Long totalVolume; + private String totalVolumeName; /** * 已使用 */ private Long useVolume; + private String useVolumename; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java index 3995aaf..da6cc35 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -376,7 +376,12 @@ public class SysOssServiceImpl implements ISysOssService, OssService { @Override public SysOssVolumeVo getVolumeVoByType(Integer type) { - return volumeMapper.selectVoOne(new LambdaQueryWrapper().eq(SysOssVolume::getType, type)); + SysOssVolumeVo ossVolumeVo = volumeMapper.selectVoOne(new LambdaQueryWrapper().eq(SysOssVolume::getType, type)); + String totalName = DataSizeUtil.format(ossVolumeVo.getTotalVolume()); + String useName = DataSizeUtil.format(ossVolumeVo.getUseVolume()); + ossVolumeVo.setTotalVolumeName(totalName); + ossVolumeVo.setUseVolumename(useName); + return ossVolumeVo; } @Override @@ -392,4 +397,5 @@ public class SysOssServiceImpl implements ISysOssService, OssService { int i = volumeMapper.decreaseUse(sysOssVolume.getId(), use); return i > 0; } + }