容量返回GB,保留两位小数

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/ReportEntity.java

@@ -35,7 +35,7 @@ public class ReportEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "全景作品数量-mix")
     private Integer mix;
 
-    @ApiModelProperty(value = "总数量")
+    @ApiModelProperty(value = "总数量, 容量单位是MB")
     private Integer total;
 
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/FodderServiceImpl.java

@@ -514,7 +514,7 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
     public Integer getVolume(String unit) {
         String volume = entityMapper.sumSize();
         log.info("查询使用空间：{} MB", volume);
-        return fileUtils.convertUnit("GB", volume);
+        return fileUtils.convertUnit(unit, volume);
     }
 
     @Override
@@ -523,7 +523,7 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
         Integer num = entityMapper.countIntSize(StrUtil.format("select ROUND(sum(file_size)/1024) from tb_fodder " +
                 "where is_delete=0 and DATE(create_time) = '{}' ", today));
         num = num == null ? 0 : num;
-        int gb = fileUtils.convertUnit("GB", num+"");
+        int gb = fileUtils.convertUnit(unit, num+"");
         return gb;
     }
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/ReportServiceImpl.java

@@ -101,7 +101,8 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
 
     private String dayTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
-        builder.append("select DATE_FORMAT( day, '%Y-%m-%d' ) as groupKey, total as count,  type from tb_report where is_delete=0 ");
+//        builder.append("select DATE_FORMAT( day, '%Y-%m-%d' ) as groupKey, total as count,  type from tb_report where is_delete=0 ");
+        builder.append("select DATE_FORMAT( day, '%Y-%m-%d' ) as groupKey, ROUND(total/1024, 2) as count,  type from tb_report where is_delete=0 ");
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
             builder.append(" and day between '").append(startTime).append("' and '").append(endTime).append("'");
         } else {
@@ -117,7 +118,8 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
     private String weekTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
 //        builder.append(" select groupKey, sum(total) as count,type from (");
-        builder.append(" select groupKey, total as count,type from (");
+//        builder.append(" select groupKey, total as count,type from (");
+        builder.append(" select groupKey, ROUND(total/1024, 2) as count,type from (");
         builder.append(" select DATE_FORMAT(DATE_ADD(day,INTERVAL- (WEEKDAY(day)) day),  '%Y-%m-%d' )  as groupKey, total," +
                 " type from tb_report where is_delete=0 ");
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
@@ -136,7 +138,8 @@ public class ReportServiceImpl extends IBaseServiceImpl<ReportEntity, Long> impl
     private String monthTrentSql(String infoType, String type, String startTime, String endTime) {
         StringBuilder builder = new StringBuilder();
 //        builder.append(" select groupKey, sum(total) as count,type from (");
-        builder.append(" select groupKey, total as count,type from (");
+//        builder.append(" select groupKey, total as count,type from (");
+        builder.append(" select groupKey, ROUND(total/1024, 2) as count,type from (");
         builder.append(" select DATE_FORMAT(day, '%Y-%m')  as groupKey, total,type from tb_report where is_delete=0");
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
             builder.append(" and day between '").append(startTime).append("' and '").append(endTime).append("'");

720yun_fd_manage/gis_service/src/main/java/com/gis/task/VisitTask.java

@@ -75,14 +75,14 @@ public class VisitTask {
 
 
     private void addVolume(LocalDate today) {
-        int volume = fodderService.getTodaySize(today, "GB");
+        int volume = fodderService.getTodaySize(today, "MB");
         ReportEntity entity = new ReportEntity();
         entity.setType("volume");
         entity.setTotal(volume); // 容量是GB
         entity.setDay(today);
         entity.setInfoType("add");
         reportService.save(entity);
-        log.info("保存容量完成, 当前容量：{} GB", volume);
+        log.info("保存容量完成, 当前容量：{} MB", volume);
         
     }
 
@@ -117,14 +117,14 @@ public class VisitTask {
      */
     private void allVolume(LocalDate today){
 
-        Integer volume = fodderService.getVolume("GB");
+        Integer volume = fodderService.getVolume("MB");
         ReportEntity entity = new ReportEntity();
         entity.setType("volume");
         entity.setTotal(volume); // 容量是GB
         entity.setDay(today);
         entity.setInfoType("all");
         reportService.save(entity);
-        log.info("保存容量完成, 当前容量：{} GB", volume);
+        log.info("保存容量完成, 当前容量：{} MB", volume);
 
     }
 

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/AgeController.java

@@ -61,7 +61,7 @@ public class AgeController {
     }
 
 
-    @ApiOperation(value = "v1.3-报表-用量趋势")
+    @ApiOperation(value = "v1.3-报表-用量趋势", notes = "容量返回GB,保留两位小数")
     @PostMapping("/report/volumeTrend")
     public Result reportVolume(@Valid @RequestBody ReportDto param) {
         ReportPo po = new ReportPo();