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 07a0259..74077a1 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 @@ -44,5 +44,5 @@ public class SysOssVolumeVo implements Serializable { private Long useVolume; private String useVolumename; - private String volumePercent; + private Double volumePercent; } 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 fd9903f..97a125d 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 @@ -385,10 +385,10 @@ public class SysOssServiceImpl implements ISysOssService, OssService { String useName = DataSizeUtil.format(useVolume); ossVolumeVo.setTotalVolumeName(totalName); ossVolumeVo.setUseVolumename(useName); - int i = BigDecimal.valueOf(useVolume) - .divide(BigDecimal.valueOf(totalVolume), 2, RoundingMode.HALF_UP) - .multiply(BigDecimal.valueOf(100)).intValue(); - ossVolumeVo.setVolumePercent(i + "%"); + double i = BigDecimal.valueOf(useVolume) + .divide(BigDecimal.valueOf(totalVolume), 4, RoundingMode.HALF_UP) + .multiply(BigDecimal.valueOf(100)).doubleValue(); + ossVolumeVo.setVolumePercent(i); return ossVolumeVo; } @@ -405,5 +405,4 @@ public class SysOssServiceImpl implements ISysOssService, OssService { int i = volumeMapper.decreaseUse(sysOssVolume.getId(), use); return i > 0; } - }