提交 46b8c220 编写于 作者: sq3536's avatar sq3536

版本升级

上级 97b40b75
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<artifactId>ibizlab-util</artifactId> <artifactId>ibizlab-util</artifactId>
<name>ibizlab-util</name> <name>ibizlab-util</name>
<description>ibizlab-util</description> <description>ibizlab-util</description>
<version>1.0.3</version> <version>1.0.4</version>
<!-- Spring Boot --> <!-- Spring Boot -->
<parent> <parent>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<properties> <properties>
<ibizlab-common.version>1.0.2</ibizlab-common.version> <ibizlab-common.version>1.0.4</ibizlab-common.version>
<!-- Alibaba Druid --> <!-- Alibaba Druid -->
<alibaba-druid.version>1.1.21</alibaba-druid.version> <alibaba-druid.version>1.1.21</alibaba-druid.version>
......
...@@ -33,7 +33,8 @@ public class DTOBase implements Serializable { ...@@ -33,7 +33,8 @@ public class DTOBase implements Serializable {
} }
} }
@JsonIgnore
@JSONField(serialize = false)
public Set<String> getFocusNull() { public Set<String> getFocusNull() {
if(focusNull==null) { if(focusNull==null) {
focusNull=new HashSet<>(); focusNull=new HashSet<>();
...@@ -62,8 +63,11 @@ public class DTOBase implements Serializable { ...@@ -62,8 +63,11 @@ public class DTOBase implements Serializable {
} }
@JsonIgnore @JsonIgnore
@JSONField(serialize = false)
private Map<String,Object> extensionparams=new HashMap<String,Object>(); private Map<String,Object> extensionparams=new HashMap<String,Object>();
@JsonIgnore
@JSONField(serialize = false)
public Map<String, Object> getExtensionparams() { public Map<String, Object> getExtensionparams() {
return extensionparams; return extensionparams;
} }
...@@ -73,6 +77,7 @@ public class DTOBase implements Serializable { ...@@ -73,6 +77,7 @@ public class DTOBase implements Serializable {
} }
@JsonAnyGetter @JsonAnyGetter
@JSONField(name = "_any", unwrapped = true, serialize = true, deserialize = false)
public Map<String , Object> any() { public Map<String , Object> any() {
return extensionparams; return extensionparams;
} }
...@@ -82,6 +87,9 @@ public class DTOBase implements Serializable { ...@@ -82,6 +87,9 @@ public class DTOBase implements Serializable {
@Transient @Transient
private BeanMap map; private BeanMap map;
@JsonIgnore
@JSONField(serialize = false)
@Transient
private BeanMap getMap() private BeanMap getMap()
{ {
if(map==null) { if(map==null) {
...@@ -101,6 +109,7 @@ public class DTOBase implements Serializable { ...@@ -101,6 +109,7 @@ public class DTOBase implements Serializable {
} }
@JsonAnySetter @JsonAnySetter
@JSONField(name = "_any", unwrapped = true, serialize = false, deserialize = true)
public void set(String field, Object value) { public void set(String field, Object value) {
field=field.toLowerCase(); field=field.toLowerCase();
String fieldRealName=DEFieldCacheMap.getFieldRealName(this.getClass(),field); String fieldRealName=DEFieldCacheMap.getFieldRealName(this.getClass(),field);
......
...@@ -23,6 +23,9 @@ public class EntityBase implements Serializable { ...@@ -23,6 +23,9 @@ public class EntityBase implements Serializable {
@Transient @Transient
private Set<String> focusNull; private Set<String> focusNull;
@JsonIgnore
@JSONField(serialize = false)
@Transient
public Set<String> getFocusNull() { public Set<String> getFocusNull() {
if(focusNull==null) { if(focusNull==null) {
focusNull=new HashSet<>(); focusNull=new HashSet<>();
...@@ -49,6 +52,9 @@ public class EntityBase implements Serializable { ...@@ -49,6 +52,9 @@ public class EntityBase implements Serializable {
@Transient @Transient
private BeanMap map; private BeanMap map;
@JsonIgnore
@JSONField(serialize = false)
@Transient
private BeanMap getMap() private BeanMap getMap()
{ {
if(map==null) { if(map==null) {
...@@ -59,9 +65,13 @@ public class EntityBase implements Serializable { ...@@ -59,9 +65,13 @@ public class EntityBase implements Serializable {
@JsonIgnore @JsonIgnore
@TableField(exist = false) @TableField(exist = false)
@JSONField(serialize = false)
@Transient @Transient
private Map<String,Object> extensionparams=new HashMap<String,Object>(); private Map<String,Object> extensionparams=new HashMap<String,Object>();
@JsonIgnore
@JSONField(serialize = false)
@Transient
public Map<String, Object> getExtensionparams() { public Map<String, Object> getExtensionparams() {
return extensionparams; return extensionparams;
} }
...@@ -81,11 +91,13 @@ public class EntityBase implements Serializable { ...@@ -81,11 +91,13 @@ public class EntityBase implements Serializable {
} }
@JsonAnyGetter @JsonAnyGetter
@JSONField(name = "_any", unwrapped = true, serialize = true, deserialize = false)
public Map<String , Object> any() { public Map<String , Object> any() {
return extensionparams; return extensionparams;
} }
@JsonAnySetter @JsonAnySetter
@JSONField(name = "_any", unwrapped = true, serialize = false, deserialize = true)
public void set(String field, Object value) { public void set(String field, Object value) {
field=field.toLowerCase(); field=field.toLowerCase();
String fieldRealName=DEFieldCacheMap.getFieldRealName(this.getClass(),field); String fieldRealName=DEFieldCacheMap.getFieldRealName(this.getClass(),field);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册