From c94acc5eff60a6e248096707eafe03a69b63ec00 Mon Sep 17 00:00:00 2001
From: zlg <482370576@qq.com>
Date: Tue, 16 Jul 2024 14:28:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SchisandraOssMinioController.java  |  3 +++
 .../SchisandraFileHeatmapDomainServiceImpl.java   | 15 +++------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java
index f586c7e..2c68e7c 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java
@@ -175,6 +175,7 @@ public class SchisandraOssMinioController {
                 list.get(name).reset();
                 String key = redisUtil.buildKey(USER_OSS_PREFIX, "download", formattedDate, userId, name);
                 HashMap<Object, Object> map = new HashMap<>();
+                map.put("fileName", name);
                 map.put("size", bytes.length);
                 map.put("time", formattedDate);
                 redisUtil.setNx(key, map, 30L, TimeUnit.DAYS);
@@ -227,6 +228,7 @@ public class SchisandraOssMinioController {
         String formattedDate = dateFormat.format(date);
         String key = redisUtil.buildKey(USER_OSS_PREFIX, "upload", formattedDate, userId, fileName);
         HashMap<Object, Object> map = new HashMap<>();
+        map.put("fileName", fileName);
         map.put("descreption", "这是一个文件");
         map.put("size", String.valueOf(file.getSize()));
         map.put("time", formattedDate);
@@ -310,6 +312,7 @@ public class SchisandraOssMinioController {
             String key = redisUtil.buildKey(USER_OSS_PREFIX, "previewFile", formattedDate, userId, filePath);
             HashMap<Object, Object> map = new HashMap<>();
             String url = bean.getMinioPreviewUrl(filePath);
+            map.put("fileName", filePath);
             map.put("url", url);
             map.put("time", formattedDate);
             redisUtil.setNx(key, map, 30L, TimeUnit.DAYS);
diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java
index 3c0bbbc..9401bda 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java
@@ -163,12 +163,9 @@ public class SchisandraFileHeatmapDomainServiceImpl implements SchisandraFileHea
         List<HashMap<Object,Object>> list=redisUtil.getDataFromDir(recent);
         List<HashMap<Object, Object>> list1 = new ArrayList<>();
         list.forEach(obj->{
-            HashMap<Object,Object> recentFile = new HashMap<>();
             String key= String.valueOf(obj.keySet().toArray()[0]);
-            String fileName=key.split(":")[6];
             HashMap<Object,Object>temp= (HashMap<Object, Object>) obj.get(key);
-            recentFile.put(fileName,temp);
-            list1.add(recentFile);
+            list1.add(temp);
         });
         return list1;
     }
@@ -179,12 +176,9 @@ public class SchisandraFileHeatmapDomainServiceImpl implements SchisandraFileHea
         List<HashMap<Object,Object>> list=redisUtil.getDataFromDir(recent);
         List<HashMap<Object, Object>> list1 = new ArrayList<>();
         list.forEach(obj->{
-            HashMap<Object,Object> recentFile = new HashMap<>();
             String key= String.valueOf(obj.keySet().toArray()[0]);
-            String fileName=key.split(":")[6];
             HashMap<Object,Object>temp= (HashMap<Object, Object>) obj.get(key);
-            recentFile.put(fileName,temp);
-            list1.add(recentFile);
+            list1.add(temp);
         });
         return list1;
     }
@@ -216,12 +210,9 @@ public class SchisandraFileHeatmapDomainServiceImpl implements SchisandraFileHea
         List<HashMap<Object,Object>> list=redisUtil.getDataFromDir(recent);
         List<HashMap<Object, Object>> list1 = new ArrayList<>();
         list.forEach(obj->{
-            HashMap<Object,Object> recentFile = new HashMap<>();
             String key= String.valueOf(obj.keySet().toArray()[0]);
-            String fileName=key.split(":")[6];
             HashMap<Object,Object>temp= (HashMap<Object, Object>) obj.get(key);
-            recentFile.put(fileName,temp);
-            list1.add(recentFile);
+            list1.add(temp);
         });
         return list1;
     }