From 83ba9be342e7efd45b8ddd9ad626a5f9374507d6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 17 十一月 2022 17:44:44 +0800
Subject: [PATCH] update 增加 字典映射注解 使用说明
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java | 3 +++
ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java
index a07e133..5c14a55 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java
@@ -20,5 +20,8 @@
@JsonSerialize(using = DictDataJsonSerializer.class)
public @interface DictDataMapper {
+ /**
+ * 璁剧疆瀛楀吀鐨則ype鍊� (濡�: sys_user_sex)
+ */
String dictType() default "";
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java b/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java
index 2950283..caa059b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java
@@ -10,6 +10,7 @@
import com.fasterxml.jackson.databind.ser.ContextualSerializer;
import com.ruoyi.common.annotation.DictDataMapper;
import com.ruoyi.common.core.service.DictService;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
@@ -33,7 +34,7 @@
DictService dictService = SpringUtils.getBean(DictService.class);
if (ObjectUtil.isNotNull(dictService)) {
String label = dictService.getDictLabel(dictType, value);
- gen.writeString(StrUtil.isNotBlank(label) ? label : value);
+ gen.writeString(StringUtils.isNotBlank(label) ? label : value);
} else {
gen.writeString(value);
}
--
Gitblit v1.9.3