yexuejc/yexuejc-base
1
0
Fork 0
mirror of https://gitee.com/jzsw-it/yexuejc-base.git synced 2025-06-27 23:52:55 +08:00
Code Issues Actions Packages Releases Wiki Activity

1.3.4

Browse Source
This commit is contained in:
maxf 2019-01-02 20:32:51 +08:00
parent a639d61624
commit ceb7b77a71
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UPDATE.md
View File

@ -1,6 +1,12 @@
yexuejc-base 更新记录
------------------
#### version ：1.3.4
**time：2019-1-2 20:32:12** <br/>
**branch：** master <br/>
**update：** <br/>
>1. objUtil list类型修复
#
#### version ：1.3.3
**time：2019-1-2 14:06:47** <br/>
**branch：** master <br/>

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>top.yexuejc</groupId>
<artifactId>yexuejc-base</artifactId>
<version>1.3.3</version>
<version>1.3.4</version>
<name>${project.artifactId}</name>
<url>https://github.com/yexuejc/yexuejc-base</url>

20
src/main/java/com/yexuejc/base/util/ObjUtil.java
View File

@ -121,6 +121,18 @@ public class ObjUtil {
continue;
}
objMap.put(fName, f.get(obj));
} else if (o instanceof List) {
List list = (List) o;
List bodyList = new ArrayList();
list.forEach(it -> {
if (null != it) {
Map<String, Object> underlineMap = getUnderlineMap(it, isAnnotationAll, putNull);
bodyList.add(underlineMap);
}
});
if (bodyList.size() > 0) {
objMap.put(fName, bodyList);
}
} else {
Map<String, Object> underlineMap = getUnderlineMap(o, isAnnotationAll, putNull);
objMap.put(fName, underlineMap);
@ -141,8 +153,11 @@ public class ObjUtil {
a.setaM1("method1");
a.setbM1("b1Mthod1");
a.protectedStr = "protectedStr";
a.c = new C();
a.c.ageInt = "test";
C c = new C();
c.ageInt = "test";
a.c = c;
a.list = new ArrayList<>();
a.list.add(c);
Map<String, Object> underlineMap = getUnderlineMap(a, false, false);
System.out.println(JsonUtil.obj2Json(underlineMap));
}
@ -170,6 +185,7 @@ public class ObjUtil {
public String testAss;
private String bM1;
private C c;
List<C> list;
public String getbM1() {
return bM1;