From 0e75aa6250b4e244b83823e3fd7d941e84c2897d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 20 九月 2022 10:45:06 +0800
Subject: [PATCH] !235 update 多排序参数支持 Merge pull request !235 from 抓蛙师/auto-7465549-dev-e641f38b
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
index 1c01912..e5c471e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
@@ -1,9 +1,12 @@
package com.ruoyi.common.utils;
+import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -11,7 +14,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* JSON 宸ュ叿绫�
@@ -28,7 +30,7 @@
}
public static String toJsonString(Object object) {
- if (StringUtils.isNull(object)) {
+ if (ObjectUtil.isNull(object)) {
return null;
}
try {
@@ -71,13 +73,26 @@
}
}
- public static <T> Map<String, T> parseMap(String text) {
+ public static Dict parseMap(String text) {
if (StringUtils.isBlank(text)) {
return null;
}
try {
- return OBJECT_MAPPER.readValue(text, new TypeReference<Map<String, T>>() {
- });
+ return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructType(Dict.class));
+ } catch (MismatchedInputException e) {
+ // 绫诲瀷涓嶅尮閰嶈鏄庝笉鏄痡son
+ return null;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static List<Dict> parseArrayMap(String text) {
+ if (StringUtils.isBlank(text)) {
+ return null;
+ }
+ try {
+ return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, Dict.class));
} catch (IOException e) {
throw new RuntimeException(e);
}
--
Gitblit v1.9.3