会员管理代码

baqing-shop/src/main/java/com/ruoyi/web/modules/openstats/service/impl/MallStatsOpenServiceImpl.java

@@ -14,6 +14,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.web.modules.openstats.constant.OpenStatsConstants;
@@ -59,7 +61,7 @@ public class MallStatsOpenServiceImpl implements IMallStatsOpenService
     {
         int year = resolveStatYear(statYear);
         ensureYearlyStatsCached(year);
-        return redisCache.getCacheObject(StatsCacheKeys.categorySales(year));
+        return readCache(StatsCacheKeys.categorySales(year), CategorySalesVO.class);
     }
 
     @Override
@@ -67,7 +69,7 @@ public class MallStatsOpenServiceImpl implements IMallStatsOpenService
     {
         int year = resolveStatYear(statYear);
         ensureYearlyStatsCached(year);
-        return redisCache.getCacheObject(StatsCacheKeys.hotCategory(year));
+        return readCache(StatsCacheKeys.hotCategory(year), HotCategoryRankVO.class);
     }
 
     @Override
@@ -75,7 +77,7 @@ public class MallStatsOpenServiceImpl implements IMallStatsOpenService
     {
         int year = resolveStatYear(statYear);
         ensureYearlyStatsCached(year);
-        return redisCache.getCacheObject(StatsCacheKeys.orderTrend(year));
+        return readCache(StatsCacheKeys.orderTrend(year), OrderTrendVO.class);
     }
 
     @Override
@@ -83,7 +85,7 @@ public class MallStatsOpenServiceImpl implements IMallStatsOpenService
     {
         int year = resolveStatYear(statYear);
         ensureYearlyStatsCached(year);
-        return redisCache.getCacheObject(StatsCacheKeys.shopEntry(year));
+        return readCache(StatsCacheKeys.shopEntry(year), ShopEntryVO.class);
     }
 
     @Override
@@ -91,14 +93,14 @@ public class MallStatsOpenServiceImpl implements IMallStatsOpenService
     {
         int year = resolveStatYear(statYear);
         ensureYearlyStatsCached(year);
-        return redisCache.getCacheObject(StatsCacheKeys.regionRank(year));
+        return readCache(StatsCacheKeys.regionRank(year), RegionRankVO.class);
     }
 
     @Override
     public ReviewWordCloudVO getReviewWordCloud()
     {
         ensureWordCloudCached();
-        return redisCache.getCacheObject(StatsCacheKeys.wordCloud());
+        return readCache(StatsCacheKeys.wordCloud(), ReviewWordCloudVO.class);
     }
 
     @Override
@@ -107,12 +109,12 @@ public class MallStatsOpenServiceImpl implements IMallStatsOpenService
         int year = resolveStatYear(statYear);
         ensureOverviewStatsCached(year);
         StatsOverviewVO overview = new StatsOverviewVO();
-        overview.setCategorySales(redisCache.getCacheObject(StatsCacheKeys.categorySales(year)));
-        overview.setHotCategoryRank(redisCache.getCacheObject(StatsCacheKeys.hotCategory(year)));
-        overview.setOrderTrend(redisCache.getCacheObject(StatsCacheKeys.orderTrend(year)));
-        overview.setShopEntry(redisCache.getCacheObject(StatsCacheKeys.shopEntry(year)));
-        overview.setRegionRank(redisCache.getCacheObject(StatsCacheKeys.regionRank(year)));
-        overview.setReviewWordCloud(redisCache.getCacheObject(StatsCacheKeys.wordCloud()));
+        overview.setCategorySales(readCache(StatsCacheKeys.categorySales(year), CategorySalesVO.class));
+        overview.setHotCategoryRank(readCache(StatsCacheKeys.hotCategory(year), HotCategoryRankVO.class));
+        overview.setOrderTrend(readCache(StatsCacheKeys.orderTrend(year), OrderTrendVO.class));
+        overview.setShopEntry(readCache(StatsCacheKeys.shopEntry(year), ShopEntryVO.class));
+        overview.setRegionRank(readCache(StatsCacheKeys.regionRank(year), RegionRankVO.class));
+        overview.setReviewWordCloud(readCache(StatsCacheKeys.wordCloud(), ReviewWordCloudVO.class));
         return overview;
     }
 
@@ -169,19 +171,34 @@ public class MallStatsOpenServiceImpl implements IMallStatsOpenService
 
     private boolean isYearlyStatsCached(int year)
     {
-        for (String cacheKey : StatsCacheKeys.yearlyStatKeys(year))
-        {
-            if (redisCache.getCacheObject(cacheKey) == null)
-            {
-                return false;
-            }
-        }
-        return true;
+        return readCache(StatsCacheKeys.categorySales(year), CategorySalesVO.class) != null
+                && readCache(StatsCacheKeys.hotCategory(year), HotCategoryRankVO.class) != null
+                && readCache(StatsCacheKeys.orderTrend(year), OrderTrendVO.class) != null
+                && readCache(StatsCacheKeys.shopEntry(year), ShopEntryVO.class) != null
+                && readCache(StatsCacheKeys.regionRank(year), RegionRankVO.class) != null;
     }
 
     private boolean isWordCloudCached()
     {
-        return redisCache.getCacheObject(StatsCacheKeys.wordCloud()) != null;
+        return readCache(StatsCacheKeys.wordCloud(), ReviewWordCloudVO.class) != null;
+    }
+
+    private <T> T readCache(String key, Class<T> type)
+    {
+        Object cached = redisCache.getCacheObject(key);
+        if (cached == null)
+        {
+            return null;
+        }
+        if (type.isInstance(cached))
+        {
+            return type.cast(cached);
+        }
+        if (cached instanceof JSONObject)
+        {
+            return ((JSONObject) cached).to(type);
+        }
+        return JSON.parseObject(JSON.toJSONString(cached), type);
     }
 
     private void refreshYearlyStatsCache(int year)

baqing-shop/src/test/java/com/ruoyi/web/FastJson2OpenStatsCacheTest.java

@@ -0,0 +1,54 @@
+package com.ruoyi.web;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.framework.config.FastJson2JsonRedisSerializer;
+import com.ruoyi.web.modules.openstats.vo.CategorySalesItemVO;
+import com.ruoyi.web.modules.openstats.vo.CategorySalesVO;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class FastJson2OpenStatsCacheTest
+{
+    private static final String CATEGORY_SALES_JSON =
+            "{\"@type\":\"com.ruoyi.web.modules.openstats.vo.CategorySalesVO\",\"items\":[{\"categoryId\":1L,\"categoryName\":\"兽药\",\"qty\":15L,\"ratio\":100.0}],\"statYear\":2026,\"totalQty\":15L}";
+
+    @Test
+    void deserializeCategorySalesAsTypedObject()
+    {
+        FastJson2JsonRedisSerializer<Object> serializer = new FastJson2JsonRedisSerializer<>(Object.class);
+        Object cached = serializer.deserialize(CATEGORY_SALES_JSON.getBytes(StandardCharsets.UTF_8));
+        Assertions.assertNotNull(cached);
+        Assertions.assertTrue(cached instanceof CategorySalesVO);
+        Assertions.assertEquals(2026, ((CategorySalesVO) cached).getStatYear());
+    }
+
+    @Test
+    void jsonObjectCanConvertToCategorySales()
+    {
+        JSONObject jsonObject = JSONObject.parseObject(CATEGORY_SALES_JSON);
+        CategorySalesVO vo = jsonObject.to(CategorySalesVO.class);
+        Assertions.assertEquals(15L, vo.getTotalQty());
+        Assertions.assertEquals("兽药", vo.getItems().get(0).getCategoryName());
+    }
+
+    @Test
+    void roundTripCategorySales()
+    {
+        CategorySalesItemVO item = new CategorySalesItemVO();
+        item.setCategoryId(1L);
+        item.setCategoryName("兽药");
+        item.setQty(15L);
+        item.setRatio(100.0);
+
+        CategorySalesVO vo = new CategorySalesVO();
+        vo.setStatYear(2026);
+        vo.setTotalQty(15L);
+        vo.setItems(Collections.singletonList(item));
+
+        FastJson2JsonRedisSerializer<Object> serializer = new FastJson2JsonRedisSerializer<>(Object.class);
+        Object cached = serializer.deserialize(serializer.serialize(vo));
+        Assertions.assertTrue(cached instanceof CategorySalesVO);
+    }
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java

@@ -6,6 +6,7 @@ import org.springframework.data.redis.serializer.SerializationException;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONReader;
 import com.alibaba.fastjson2.JSONWriter;
+import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.filter.Filter;
 import com.ruoyi.common.constant.Constants;
 
@@ -45,8 +46,72 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
         {
             return null;
         }
-        String str = new String(bytes, DEFAULT_CHARSET);
+        String str = normalizeLegacyCollectionSyntax(new String(bytes, DEFAULT_CHARSET));
+        try
+        {
+            Object parsed = JSON.parseObject(str, clazz, AUTO_TYPE_FILTER, JSONReader.Feature.SupportAutoType);
+            return castParsedValue(parsed);
+        }
+        catch (Exception ex)
+        {
+            try
+            {
+                JSONObject jsonObject = JSON.parseObject(str, JSONObject.class, AUTO_TYPE_FILTER,
+                        JSONReader.Feature.SupportAutoType);
+                if (jsonObject == null)
+                {
+                    return null;
+                }
+                return castParsedValue(jsonObject);
+            }
+            catch (Exception fallbackEx)
+            {
+                throw new SerializationException("Could not deserialize: " + ex.getMessage(), ex);
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private T castParsedValue(Object parsed)
+    {
+        if (parsed == null)
+        {
+            return null;
+        }
+        if (clazz.isInstance(parsed))
+        {
+            return clazz.cast(parsed);
+        }
+        if (parsed instanceof JSONObject)
+        {
+            JSONObject jsonObject = (JSONObject) parsed;
+            String typeName = jsonObject.getString("@type");
+            if (typeName != null)
+            {
+                try
+                {
+                    Class<?> targetType = Class.forName(typeName);
+                    return (T) jsonObject.to(targetType);
+                }
+                catch (ClassNotFoundException ignored)
+                {
+                    // fall through
+                }
+            }
+            if (clazz != Object.class)
+            {
+                return jsonObject.toJavaObject(clazz);
+            }
+        }
+        return (T) parsed;
+    }
 
-        return JSON.parseObject(str, clazz, AUTO_TYPE_FILTER);
+    private static String normalizeLegacyCollectionSyntax(String str)
+    {
+        if (str == null || str.isEmpty())
+        {
+            return str;
+        }
+        return str.replace("LinkedHashSet[", "[").replace("HashSet[", "[").replace("Set[", "[");
     }
 }