gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

为返回给界面的bean中的字段添加@JsonInclude(value=Include.NON_NULL)注解,当值为null时隐藏字段

Browse Source
This commit is contained in:
RenKaiGe-Office
2018-07-30 14:01:07 +08:00
parent 927e8d1926
commit d37ce642db
8 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/domain/restful/NtcAttrTypeReport.java
View File

@@ -1,12 +1,14 @@
package com.nis.domain.restful;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.wordnik.swagger.annotations.ApiModelProperty;
public class NtcAttrTypeReport extends NtcReportEntity<NtcAttrTypeReport>{
private static final long serialVersionUID = -5609071907676757108L;
@JsonInclude(value=Include.NON_NULL)
@ApiModelProperty(value="性质", required=true)
protected Integer attrType ;

3
src/main/java/com/nis/domain/restful/NtcDestipCountryReport.java
View File

@@ -1,11 +1,14 @@
package com.nis.domain.restful;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.wordnik.swagger.annotations.ApiModelProperty;
public class NtcDestipCountryReport extends NtcReportEntity<NtcDestipCountryReport>{
private static final long serialVersionUID = 7911364106357601141L;
@JsonInclude(value=Include.NON_NULL)
@ApiModelProperty(value="所属国家", required=true)
protected String destCountry;

4
src/main/java/com/nis/domain/restful/NtcEntranceReport.java
View File

@@ -1,12 +1,14 @@
package com.nis.domain.restful;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.wordnik.swagger.annotations.ApiModelProperty;
public class NtcEntranceReport extends NtcReportEntity<NtcEntranceReport> {
private static final long serialVersionUID = -3973713578165502900L;
@JsonInclude(value=Include.NON_NULL)
@ApiModelProperty(value = "局点（出入口）", required = true)
protected Integer entranceId;

15
src/main/java/com/nis/domain/restful/NtcLwhhReport.java
View File

@@ -1,30 +1,33 @@
package com.nis.domain.restful;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.wordnik.swagger.annotations.ApiModelProperty;
public class NtcLwhhReport extends NtcReportEntity<NtcLwhhReport>{
public class NtcLwhhReport extends NtcReportEntity<NtcLwhhReport> {
private static final long serialVersionUID = -5980925900825684234L;
@JsonInclude(value = Include.NON_NULL)
@ApiModelProperty(value = "性质", required = true)
protected Integer lwhh;
@ApiModelProperty(value="性质", required=true)
protected Integer lwhh ;
protected String searchLwhh;
/**
* @param lwhh the lwhh to set
*/
public void setLwhh(Integer lwhh) {
this.lwhh = lwhh;
}
/**
* @return the lwhh
*/
public Integer getLwhh() {
return lwhh;
}
/**
* @return the searchLwhh
*/
@@ -32,7 +35,7 @@ public class NtcLwhhReport extends NtcReportEntity<NtcLwhhReport>{
public String getSearchLwhh() {
return searchLwhh;
}
/**
* @param searchLwhh the searchLwhh to set
*/

3
src/main/java/com/nis/domain/restful/NtcPzReport.java
View File

@@ -1,11 +1,14 @@
package com.nis.domain.restful;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.wordnik.swagger.annotations.ApiModelProperty;
public class NtcPzReport extends NtcReportEntity<NtcPzReport>{
private static final long serialVersionUID = 987165268916441272L;
@JsonInclude(value=Include.NON_NULL)
@ApiModelProperty(value="配置ID", required=true)
protected Long cfgId;

42
src/main/java/com/nis/domain/restful/NtcReportEntity.java
View File

@@ -7,21 +7,26 @@ import java.util.Map;
import javax.xml.bind.annotation.XmlTransient;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.common.collect.Maps;
import com.nis.domain.Page;
import com.nis.util.JsonDateSerializer;
import com.wordnik.swagger.annotations.ApiModelProperty;
public abstract class NtcReportEntity<T> implements Serializable{
@ApiModelProperty(value="业务类型", required=true)
public abstract class NtcReportEntity<T> implements Serializable {
@JsonInclude(value = Include.NON_NULL)
@ApiModelProperty(value = "业务类型", required = true)
protected Integer service;
@ApiModelProperty(value="日志数量", required=true)
@JsonInclude(value = Include.NON_NULL)
@ApiModelProperty(value = "日志数量", required = true)
protected Long sum;
@ApiModelProperty(value="统计时间", required=true)
@JsonInclude(value = Include.NON_NULL)
@ApiModelProperty(value = "统计时间", required = true)
protected Date reportTime;
/**
* 业务类型：1:配置命中总量业务 2:配置报表业务
*/
@@ -31,9 +36,9 @@ public abstract class NtcReportEntity<T> implements Serializable{
protected Long searchReportStartTimeCluster;
protected Long searchReportEndTimeCluster;
protected String searchService;
protected Page<T> page;
protected Page<T> page;
/**
* 自定义SQL（SQL标识，SQL内容）
*/
@@ -46,7 +51,7 @@ public abstract class NtcReportEntity<T> implements Serializable{
super();
// TODO Auto-generated constructor stub
}
/**
* @param cfgId
* @param service
@@ -72,7 +77,7 @@ public abstract class NtcReportEntity<T> implements Serializable{
this.sum = sum;
}
@JsonSerialize(using=JsonDateSerializer.class)
@JsonSerialize(using = JsonDateSerializer.class)
public Date getReportTime() {
return reportTime;
}
@@ -80,6 +85,7 @@ public abstract class NtcReportEntity<T> implements Serializable{
public void setReportTime(Date reportTime) {
this.reportTime = reportTime;
}
@JsonIgnore
public String getSearchBusinessType() {
return searchBusinessType;
@@ -88,6 +94,7 @@ public abstract class NtcReportEntity<T> implements Serializable{
public void setSearchBusinessType(String searchBusinessType) {
this.searchBusinessType = searchBusinessType;
}
@JsonIgnore
public String getSearchReportStartTime() {
return searchReportStartTime;
@@ -96,6 +103,7 @@ public abstract class NtcReportEntity<T> implements Serializable{
public void setSearchReportStartTime(String searchReportStartTime) {
this.searchReportStartTime = searchReportStartTime;
}
@JsonIgnore
public String getSearchReportEndTime() {
return searchReportEndTime;
@@ -104,6 +112,7 @@ public abstract class NtcReportEntity<T> implements Serializable{
public void setSearchReportEndTime(String searchReportEndTime) {
this.searchReportEndTime = searchReportEndTime;
}
@JsonIgnore
public Long getSearchReportStartTimeCluster() {
return searchReportStartTimeCluster;
@@ -112,6 +121,7 @@ public abstract class NtcReportEntity<T> implements Serializable{
public void setSearchReportStartTimeCluster(Long searchReportStartTimeCluster) {
this.searchReportStartTimeCluster = searchReportStartTimeCluster;
}
@JsonIgnore
public Long getSearchReportEndTimeCluster() {
return searchReportEndTimeCluster;
@@ -120,6 +130,7 @@ public abstract class NtcReportEntity<T> implements Serializable{
public void setSearchReportEndTimeCluster(Long searchReportEndTimeCluster) {
this.searchReportEndTimeCluster = searchReportEndTimeCluster;
}
@JsonIgnore
public String getSearchService() {
return searchService;
@@ -132,12 +143,12 @@ public abstract class NtcReportEntity<T> implements Serializable{
@JsonIgnore
@XmlTransient
public Page<T> getPage() {
if (page == null){
if (page == null) {
page = new Page<T>();
}
return page;
}
public Page<T> setPage(Page<T> page) {
this.page = page;
return page;
@@ -146,7 +157,7 @@ public abstract class NtcReportEntity<T> implements Serializable{
@JsonIgnore
@XmlTransient
public Map<String, String> getSqlMap() {
if (sqlMap == null){
if (sqlMap == null) {
sqlMap = Maps.newHashMap();
}
return sqlMap;
@@ -155,6 +166,5 @@ public abstract class NtcReportEntity<T> implements Serializable{
public void setSqlMap(Map<String, String> sqlMap) {
this.sqlMap = sqlMap;
}
}

4
src/main/java/com/nis/domain/restful/NtcSrcipDomesticReport.java
View File

@@ -1,13 +1,17 @@
package com.nis.domain.restful;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.wordnik.swagger.annotations.ApiModelProperty;
public class NtcSrcipDomesticReport extends NtcReportEntity<NtcSrcipDomesticReport>{
private static final long serialVersionUID = -2146157609572355782L;
@JsonInclude(value=Include.NON_NULL)
@ApiModelProperty(value="所属省", required=true)
protected String srcProvince;
@JsonInclude(value=Include.NON_NULL)
@ApiModelProperty(value="所属市", required=true)
protected String srcCity;

4
src/main/java/com/nis/domain/restful/NtcTagReport.java
View File

@@ -1,13 +1,15 @@
package com.nis.domain.restful;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.wordnik.swagger.annotations.ApiModelProperty;
public class NtcTagReport extends NtcReportEntity<NtcTagReport>{
private static final long serialVersionUID = -3973713578165502900L;
@JsonInclude(value=Include.NON_NULL)
@ApiModelProperty(value="标签", required=true)
protected Integer tag;