会员管理代码

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

@@ -0,0 +1,55 @@
+package com.ruoyi.web;
+
+import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class SysDictDataJsonTest
+{
+    @Test
+    void parseArrayIgnoresLegacyDefaultField()
+    {
+        String json = "[{\"dictLabel\":\"正常\",\"dictValue\":\"0\",\"isDefault\":\"Y\",\"default\":false,\"status\":\"0\"},"
+                + "{\"dictLabel\":\"停用\",\"dictValue\":\"1\",\"isDefault\":\"N\",\"default\":false,\"status\":\"0\"}]";
+        List<SysDictData> list = JSON.parseArray(json, SysDictData.class);
+        Assertions.assertEquals(2, list.size());
+        Assertions.assertEquals("正常", list.get(0).getDictLabel());
+    }
+
+    @Test
+    void roundTripDoesNotEmitDefaultField()
+    {
+        SysDictData data = new SysDictData();
+        data.setDictLabel("正常");
+        data.setDictValue("0");
+        data.setIsDefault("Y");
+        data.setStatus("0");
+
+        String json = JSON.toJSONString(Collections.singletonList(data));
+        Assertions.assertFalse(json.contains("\"default\""));
+
+        List<SysDictData> list = JSON.parseArray(json, SysDictData.class);
+        Assertions.assertEquals(1, list.size());
+        Assertions.assertEquals("0", list.get(0).getDictValue());
+    }
+
+    @Test
+    void parseFromLinkedHashMapList()
+    {
+        LinkedHashMap<String, Object> row = new LinkedHashMap<>();
+        row.put("dictLabel", "正常");
+        row.put("dictValue", "0");
+        row.put("isDefault", "Y");
+        row.put("default", false);
+        row.put("status", "0");
+
+        String json = JSON.toJSONString(Collections.singletonList(row));
+        List<SysDictData> list = JSON.parseArray(json, SysDictData.class);
+        Assertions.assertEquals(1, list.size());
+        Assertions.assertEquals("正常", list.get(0).getDictLabel());
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java

@@ -4,6 +4,8 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.constant.UserConstants;
@@ -129,6 +131,8 @@ public class SysDictData extends BaseEntity
         this.listClass = listClass;
     }
 
+    @JSONField(serialize = false, deserialize = false)
+    @JsonIgnore
     public boolean getDefault()
     {
         return UserConstants.YES.equals(this.isDefault);

ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java

@@ -11,6 +11,8 @@ import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 字典工具类
@@ -19,6 +21,8 @@ import com.ruoyi.common.utils.spring.SpringUtils;
  */
 public class DictUtils
 {
+    private static final Logger log = LoggerFactory.getLogger(DictUtils.class);
+
     /**
      * 分隔符
      */
@@ -48,8 +52,33 @@ public class DictUtils
         {
             return null;
         }
+        try
+        {
+            return parseDictCacheValue(arrayCache);
+        }
+        catch (Exception ex)
+        {
+            log.warn("字典缓存解析失败，已清除 key={}，原因={}", getCacheKey(key), ex.getMessage());
+            removeDictCache(key);
+            return null;
+        }
+    }
+
+    private static List<SysDictData> parseDictCacheValue(Object arrayCache)
+    {
         if (arrayCache instanceof List)
         {
+            List<?> rawList = (List<?>) arrayCache;
+            if (rawList.isEmpty())
+            {
+                return new java.util.ArrayList<>();
+            }
+            if (rawList.get(0) instanceof SysDictData)
+            {
+                @SuppressWarnings("unchecked")
+                List<SysDictData> typed = (List<SysDictData>) arrayCache;
+                return typed;
+            }
             return JSON.parseArray(JSON.toJSONString(arrayCache), SysDictData.class);
         }
         if (arrayCache instanceof JSONArray)