manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加JsonFormat条件防止出现类型转换问题

Browse Source
This commit is contained in:
thinkgem
2025-06-05 13:04:34 +08:00
parent 119ceae9fe
commit 6b7813beaf
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
View File

@@ -113,13 +113,12 @@ public class JsonMapper extends ObjectMapper {
@Override @Override
public Object findSerializer(Annotated a) { public Object findSerializer(Annotated a) {
if (a instanceof AnnotatedMethod) { if (a instanceof AnnotatedMethod) {
AnnotatedElement m = a.getAnnotated();
JsonFormat jf = m.getAnnotation(JsonFormat.class);
if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
return new JeeSiteJsonSerializer(jf.pattern());
}
AnnotatedMethod am = (AnnotatedMethod) a; AnnotatedMethod am = (AnnotatedMethod) a;
if (am.getRawReturnType() == Date.class) { if (am.getRawReturnType() == Date.class) {
JsonFormat jf = am.getAnnotation(JsonFormat.class);
if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
return new JeeSiteJsonSerializer(jf.pattern());
}
return new JeeSiteJsonSerializer(null); return new JeeSiteJsonSerializer(null);
} }
} else if (a instanceof AnnotatedClass) { } else if (a instanceof AnnotatedClass) {
@@ -132,13 +131,13 @@ public class JsonMapper extends ObjectMapper {
@Override @Override
public Object findDeserializer(Annotated a) { public Object findDeserializer(Annotated a) {
if (a instanceof AnnotatedMethod) { if (a instanceof AnnotatedMethod) {
AnnotatedElement m = a.getAnnotated();
JsonFormat jf = m.getAnnotation(JsonFormat.class);
if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
return new JeeSiteJsonDeserializer(jf.pattern());
}
AnnotatedMethod am = (AnnotatedMethod) a; AnnotatedMethod am = (AnnotatedMethod) a;
if (am.getParameterCount() > 0 && am.getParameterType(0).getRawClass() == Date.class) { if (am.getParameterCount() > 0 && am.getParameterType(0).getRawClass() == Date.class) {
AnnotatedElement m = am.getAnnotated();
JsonFormat jf = m.getAnnotation(JsonFormat.class);
if (jf != null && StringUtils.containsAnyIgnoreCase(jf.pattern(), pattern)) {
return new JeeSiteJsonDeserializer(jf.pattern());
}
return new JeeSiteJsonDeserializer(null); return new JeeSiteJsonDeserializer(null);
} }
} else if (a instanceof AnnotatedClass) { } else if (a instanceof AnnotatedClass) {