提交

src/main/java/com/gz/rvo/statistics/ArchiveStatisticsRVO.java

@@ -15,7 +15,7 @@ public class ArchiveStatisticsRVO {
     private Integer id;
     private Integer parentId;
     //磁盘占用的大小
-    private Long space;
+    private String space;
     //占用磁盘的总大小
     private String sumSpace;
 }

src/main/java/com/gz/rvo/statistics/ArchiveYearStatisticsRVO.java

@@ -12,7 +12,7 @@ public class ArchiveYearStatisticsRVO {
     private Integer archiveCount;
     private Integer fileCount;
     //占用磁盘大小
-    private Long space;
+    private String space;
     //累计占用磁盘大小
     private String sumSpace;
 

src/main/java/com/gz/service/statistics/impl/SelectStatisticsServiceImpl.java

@@ -41,8 +41,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import javax.persistence.Id;
 import java.io.File;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -78,7 +78,7 @@ public class SelectStatisticsServiceImpl implements SelectStatisticsService {
     @Override
     public List<ArchiveStatisticsRVO> selectStatisticsByType(StatisticsVO vo) {
         String key = String.format(DataGlobalVariable.CACHE_KEY_FOMAT, this.getClass().getName(), Thread.currentThread().getStackTrace()[1].getMethodName(), JSONObject.toJSONString(vo));
-        if (false) {
+        if (stringRedisTemplate.hasKey(key)) {
             return JSONArray.parseArray(stringRedisTemplate.opsForValue().get(key), ArchiveStatisticsRVO.class);
         } else {
             if (vo.getMl() != null) {
@@ -97,7 +97,7 @@ public class SelectStatisticsServiceImpl implements SelectStatisticsService {
                 if (dto.getParentId() != -1) {
                     for (ArchivesTreeDTO dt : archivesTreeDTOS) {
                         if (dto.getParentId() == dt.getId()) {
-                            list.add(dt.getTitle());
+                            list.add(dt.getCode());
                         }
                     }
                 }
@@ -117,6 +117,8 @@ public class SelectStatisticsServiceImpl implements SelectStatisticsService {
                             if (ObjectUtil.isNotEmpty(year)) {
                                 //分类
                                 for (File category : year.listFiles()) {
+
+
                                     if (ObjectUtil.isNotEmpty(category)) {
                                         if (list.contains(category.getName())) {
                                             //二级分类
@@ -124,7 +126,11 @@ public class SelectStatisticsServiceImpl implements SelectStatisticsService {
                                                 if (ObjectUtil.isNotEmpty(category2)) {
                                                     Long s1 = this.getLinuxDirectorySize(category);
                                                     hj+=s1;
-                                                    map.put(category.getName(), s1);
+                                                    if (map.keySet().stream().anyMatch(i -> i.equals(category2.getName()))){
+                                                        map.put(category2.getName(),map.get(category2.getName())  + s1);
+                                                    }else {
+                                                        map.put(category2.getName(),s1);
+                                                    }
                                                 }
                                             }
                                         }
@@ -138,10 +144,14 @@ public class SelectStatisticsServiceImpl implements SelectStatisticsService {
                     }
                 }
             }
+            Map<String,String> map1=new HashMap<>();
             //内存大小赋值
             for (Map.Entry<String, Long> entry : map.entrySet()) {
+                map1.put(entry.getKey(),UnitUtils.storageUnitConvertStr(entry.getValue()));
+            }
+            for (Map.Entry<String, String> entry : map1.entrySet()) {
                 for (ArchiveStatisticsRVO li : tree) {
-                    if (li.getTitle().equals(entry.getKey())) {
+                    if (li.getCode().equals(entry.getKey())) {
                         li.setSpace(entry.getValue());
                     }
                 }
@@ -197,7 +207,8 @@ public class SelectStatisticsServiceImpl implements SelectStatisticsService {
                                 hj+=linuxDirectorySize;
                                 archiveYearStatisticsRVOS.forEach(statisticsRVO -> {
                                     if (statisticsRVO.getGdnd().equals(year.getName())) {
-                                        statisticsRVO.setSpace(linuxDirectorySize);
+                                        String s = UnitUtils.storageUnitConvertStr(linuxDirectorySize);
+                                        statisticsRVO.setSpace(s);
                                     }
                                 });
                             }
@@ -205,6 +216,7 @@ public class SelectStatisticsServiceImpl implements SelectStatisticsService {
                     }
                 }
             }
+
             archiveYearStatisticsRVOS.get(archiveYearStatisticsRVOS.size()-1).setSumSpace(UnitUtils.storageUnitConvertStr(hj));
             stringRedisTemplate.opsForValue().set(key, JSONObject.toJSONString(archiveYearStatisticsRVOS), DataGlobalVariable.CACHE_EXPIRES, DataGlobalVariable.TIME_UNIT);
             return archiveYearStatisticsRVOS;

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
   servlet:
     multipart:
       max-file-size: 5120MB

src/main/resources/static/page/statistics/archiveStatistics.html

@@ -98,12 +98,14 @@
                 done: function (res, curr, count) {
                     console.log(res, curr, count)
                     let archiveCount = 0,
-                        fileCount = 0
+                        fileCount = 0,
+                        sumSpace = null
                     res.data.forEach(item => {
                         if (item.pid === -1) {
                             archiveCount += item.archiveCount
                             fileCount += item.fileCount
                         }
+                        sumSpace = item.sumSpace
                     })
                     console.log(archiveCount, fileCount)
                     // $('th').css({'background-color': '#1aa094', 'color': '#fff','font-weight':'bold'})
@@ -115,6 +117,8 @@
                             _div.html(archiveCount);
                         } else if (index === 4) {
                             _div.html(fileCount);
+                        } else if(index === 5){
+                            _div.html(sumSpace)
                         }
 
                         // var content = _div.html();

src/main/resources/static/page/statistics/archiveYearStatistics.html

@@ -101,6 +101,11 @@
                     }
                 },
                 done: function (res, curr, count) {
+                    let lm = null
+                    res.data.forEach(item => {
+                            lm = item.sumSpace
+                    })
+
                     // $('th').css({'background-color': '#1aa094', 'color': '#fff','font-weight':'bold'})
                     var divArr = layui.$(".layui-table-total div.layui-table-cell");
                     layui.$.each(divArr,function (index,item) {
@@ -108,6 +113,9 @@
                         var content = _div.html();
                         content = content.replace(".00","");
                         _div.html(content);
+                        if(index === 4){
+                            _div.html(lm)
+                        }
                     });
                 },
                 cols: [[