From bb9522eaa9947956eea5866c86fbdf850b4b2aec Mon Sep 17 00:00:00 2001
From: jaysunxiao <jaysunxiao@gmail.com>
Date: Sat, 26 Jun 2021 14:13:11 +0800
Subject: [PATCH] =?UTF-8?q?perf[storage]:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84=EF=BC=8C=E5=B9=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zfoo/storage/manager/IStorageManager.java  |  5 ++---
 .../zfoo/storage/manager/StorageManager.java   | 18 +++++++++---------
 .../com/zfoo/storage/model/vo/Storage.java     | 12 ------------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/storage/src/main/java/com/zfoo/storage/manager/IStorageManager.java b/storage/src/main/java/com/zfoo/storage/manager/IStorageManager.java
index 376d59f3..1d261ce7 100644
--- a/storage/src/main/java/com/zfoo/storage/manager/IStorageManager.java
+++ b/storage/src/main/java/com/zfoo/storage/manager/IStorageManager.java
@@ -17,7 +17,6 @@ import com.zfoo.storage.model.vo.Storage;
 import org.springframework.lang.Nullable;
 
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @author jaysunxiao
@@ -43,9 +42,9 @@ public interface IStorageManager {
     @Nullable
     Storage<?, ?> getStorage(Class<?> clazz);
 
-    Set<Class<?>> allStorageClassSet();
+    Map<Class<?>, Boolean> allStorageUsableMap();
 
-    Map<Class<?>, Storage<?, ?>> getStorageMap();
+    Map<Class<?>, Storage<?, ?>> storageMap();
 
     void updateStorage(Class<?> clazz, Storage<?, ?> storage);
 
diff --git a/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java b/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java
index 3ad2fb82..5cc8d231 100644
--- a/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java
+++ b/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java
@@ -59,9 +59,9 @@ public class StorageManager implements IStorageManager {
     private Map<Class<?>, Storage<?, ?>> storageMap = new HashMap<>();
 
     /**
-     * 全部的Storage定义
+     * 全部的Storage定义，key为对应的excel配置表，value为当前配置表是否在当前项目中使用
      */
-    private Set<Class<?>> allStorageClassSet = new HashSet<>();
+    private Map<Class<?>, Boolean> allStorageUsableMap = new HashMap<>();
 
     public StorageConfig getStorageConfig() {
         return storageConfig;
@@ -97,7 +97,7 @@ public class StorageManager implements IStorageManager {
                 Storage<?, ?> storage = new Storage<>();
                 storage.init(definition.getResource().getInputStream(), definition.getClazz());
                 storageMap.putIfAbsent(clazz, storage);
-                allStorageClassSet.add(clazz);
+                allStorageUsableMap.put(clazz, false);
             }
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -147,15 +147,15 @@ public class StorageManager implements IStorageManager {
 
                         ReflectionUtils.makeAccessible(field);
                         ReflectionUtils.setField(field, bean, storage);
-                        storage.setUsable(true);
+                        allStorageUsableMap.put(resourceClazz, true);
                     });
         }
     }
 
     @Override
     public void initAfter() {
-        var unusableStorageClassList = storageMap.entrySet().stream()
-                .filter(it -> !it.getValue().isUsable())
+        var unusableStorageClassList = allStorageUsableMap.entrySet().stream()
+                .filter(it -> !it.getValue())
                 .map(it -> it.getKey())
                 .collect(Collectors.toList());
 
@@ -170,12 +170,12 @@ public class StorageManager implements IStorageManager {
     }
 
     @Override
-    public Set<Class<?>> allStorageClassSet() {
-        return allStorageClassSet;
+    public Map<Class<?>, Boolean> allStorageUsableMap() {
+        return allStorageUsableMap;
     }
 
     @Override
-    public Map<Class<?>, Storage<?, ?>> getStorageMap() {
+    public Map<Class<?>, Storage<?, ?>> storageMap() {
         return storageMap;
     }
 
diff --git a/storage/src/main/java/com/zfoo/storage/model/vo/Storage.java b/storage/src/main/java/com/zfoo/storage/model/vo/Storage.java
index a84b05ae..20161f59 100644
--- a/storage/src/main/java/com/zfoo/storage/model/vo/Storage.java
+++ b/storage/src/main/java/com/zfoo/storage/model/vo/Storage.java
@@ -39,11 +39,6 @@ public class Storage<K, V> {
     private IdDef idDef;
     private Map<String, IndexDef> indexDefMap;
 
-    /**
-     * 是否被使用
-     */
-    private boolean usable = false;
-
     public Storage() {
     }
 
@@ -140,11 +135,4 @@ public class Storage<K, V> {
         return dataMap.size();
     }
 
-    public boolean isUsable() {
-        return usable;
-    }
-
-    public void setUsable(boolean usable) {
-        this.usable = usable;
-    }
 }