diff --git a/src/main/java/com/nis/domain/restful/NtcAttrTypeReport.java b/src/main/java/com/nis/domain/restful/NtcAttrTypeReport.java index 198e2dc..b9b4695 100644 --- a/src/main/java/com/nis/domain/restful/NtcAttrTypeReport.java +++ b/src/main/java/com/nis/domain/restful/NtcAttrTypeReport.java @@ -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{ private static final long serialVersionUID = -5609071907676757108L; - + @JsonInclude(value=Include.NON_NULL) @ApiModelProperty(value="性质", required=true) protected Integer attrType ; diff --git a/src/main/java/com/nis/domain/restful/NtcDestipCountryReport.java b/src/main/java/com/nis/domain/restful/NtcDestipCountryReport.java index deb01f7..16b8ff4 100644 --- a/src/main/java/com/nis/domain/restful/NtcDestipCountryReport.java +++ b/src/main/java/com/nis/domain/restful/NtcDestipCountryReport.java @@ -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{ private static final long serialVersionUID = 7911364106357601141L; + @JsonInclude(value=Include.NON_NULL) @ApiModelProperty(value="所属国家", required=true) protected String destCountry; diff --git a/src/main/java/com/nis/domain/restful/NtcEntranceReport.java b/src/main/java/com/nis/domain/restful/NtcEntranceReport.java index f3d7cd6..ee61c45 100644 --- a/src/main/java/com/nis/domain/restful/NtcEntranceReport.java +++ b/src/main/java/com/nis/domain/restful/NtcEntranceReport.java @@ -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 { private static final long serialVersionUID = -3973713578165502900L; - + @JsonInclude(value=Include.NON_NULL) @ApiModelProperty(value = "局点（出入口）", required = true) protected Integer entranceId; diff --git a/src/main/java/com/nis/domain/restful/NtcLwhhReport.java b/src/main/java/com/nis/domain/restful/NtcLwhhReport.java index e1fb938..05f44d0 100644 --- a/src/main/java/com/nis/domain/restful/NtcLwhhReport.java +++ b/src/main/java/com/nis/domain/restful/NtcLwhhReport.java @@ -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{ +public class NtcLwhhReport extends NtcReportEntity { 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{ public String getSearchLwhh() { return searchLwhh; } - + /** * @param searchLwhh the searchLwhh to set */ diff --git a/src/main/java/com/nis/domain/restful/NtcPzReport.java b/src/main/java/com/nis/domain/restful/NtcPzReport.java index 115bedc..a40bbb5 100644 --- a/src/main/java/com/nis/domain/restful/NtcPzReport.java +++ b/src/main/java/com/nis/domain/restful/NtcPzReport.java @@ -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{ private static final long serialVersionUID = 987165268916441272L; + @JsonInclude(value=Include.NON_NULL) @ApiModelProperty(value="配置ID", required=true) protected Long cfgId; diff --git a/src/main/java/com/nis/domain/restful/NtcReportEntity.java b/src/main/java/com/nis/domain/restful/NtcReportEntity.java index fa1dce0..2fc9006 100644 --- a/src/main/java/com/nis/domain/restful/NtcReportEntity.java +++ b/src/main/java/com/nis/domain/restful/NtcReportEntity.java @@ -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 implements Serializable{ - - @ApiModelProperty(value="业务类型", required=true) +public abstract class NtcReportEntity 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 implements Serializable{ protected Long searchReportStartTimeCluster; protected Long searchReportEndTimeCluster; protected String searchService; - - protected Page page; - + + protected Page page; + /** * 自定义SQL（SQL标识，SQL内容） */ @@ -46,7 +51,7 @@ public abstract class NtcReportEntity implements Serializable{ super(); // TODO Auto-generated constructor stub } - + /** * @param cfgId * @param service @@ -72,7 +77,7 @@ public abstract class NtcReportEntity 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 implements Serializable{ public void setReportTime(Date reportTime) { this.reportTime = reportTime; } + @JsonIgnore public String getSearchBusinessType() { return searchBusinessType; @@ -88,6 +94,7 @@ public abstract class NtcReportEntity implements Serializable{ public void setSearchBusinessType(String searchBusinessType) { this.searchBusinessType = searchBusinessType; } + @JsonIgnore public String getSearchReportStartTime() { return searchReportStartTime; @@ -96,6 +103,7 @@ public abstract class NtcReportEntity implements Serializable{ public void setSearchReportStartTime(String searchReportStartTime) { this.searchReportStartTime = searchReportStartTime; } + @JsonIgnore public String getSearchReportEndTime() { return searchReportEndTime; @@ -104,6 +112,7 @@ public abstract class NtcReportEntity implements Serializable{ public void setSearchReportEndTime(String searchReportEndTime) { this.searchReportEndTime = searchReportEndTime; } + @JsonIgnore public Long getSearchReportStartTimeCluster() { return searchReportStartTimeCluster; @@ -112,6 +121,7 @@ public abstract class NtcReportEntity implements Serializable{ public void setSearchReportStartTimeCluster(Long searchReportStartTimeCluster) { this.searchReportStartTimeCluster = searchReportStartTimeCluster; } + @JsonIgnore public Long getSearchReportEndTimeCluster() { return searchReportEndTimeCluster; @@ -120,6 +130,7 @@ public abstract class NtcReportEntity implements Serializable{ public void setSearchReportEndTimeCluster(Long searchReportEndTimeCluster) { this.searchReportEndTimeCluster = searchReportEndTimeCluster; } + @JsonIgnore public String getSearchService() { return searchService; @@ -132,12 +143,12 @@ public abstract class NtcReportEntity implements Serializable{ @JsonIgnore @XmlTransient public Page getPage() { - if (page == null){ + if (page == null) { page = new Page(); } return page; } - + public Page setPage(Page page) { this.page = page; return page; @@ -146,7 +157,7 @@ public abstract class NtcReportEntity implements Serializable{ @JsonIgnore @XmlTransient public Map getSqlMap() { - if (sqlMap == null){ + if (sqlMap == null) { sqlMap = Maps.newHashMap(); } return sqlMap; @@ -155,6 +166,5 @@ public abstract class NtcReportEntity implements Serializable{ public void setSqlMap(Map sqlMap) { this.sqlMap = sqlMap; } - - + } diff --git a/src/main/java/com/nis/domain/restful/NtcSrcipDomesticReport.java b/src/main/java/com/nis/domain/restful/NtcSrcipDomesticReport.java index 6d4ad1a..a4d8c9f 100644 --- a/src/main/java/com/nis/domain/restful/NtcSrcipDomesticReport.java +++ b/src/main/java/com/nis/domain/restful/NtcSrcipDomesticReport.java @@ -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{ 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; diff --git a/src/main/java/com/nis/domain/restful/NtcTagReport.java b/src/main/java/com/nis/domain/restful/NtcTagReport.java index c163c3e..5eb9ea6 100644 --- a/src/main/java/com/nis/domain/restful/NtcTagReport.java +++ b/src/main/java/com/nis/domain/restful/NtcTagReport.java @@ -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{ private static final long serialVersionUID = -3973713578165502900L; - + @JsonInclude(value=Include.NON_NULL) @ApiModelProperty(value="标签", required=true) protected Integer tag;