为GroupReuse中添加service字段,为IpRegion中添加userregion字段,以支持app协议ip业务单独添加域的功能

src/main/java/com/nis/domain/restful/GroupReuse.java

@@ -24,6 +24,9 @@ import com.wordnik.swagger.annotations.ApiModelProperty;
 public class GroupReuse implements Serializable {
 
 	private static final long serialVersionUID = 1L;
+	// ASN-IP阻断和监测不用传service和ipregion.userRegion字段,当是app协议ip业务时需要传入ipregion.userRegion字段
+	@ApiModelProperty(value = "业务ID", required = true)
+	private Integer service;
 
 	@ApiModelProperty(value = "字符串域分组列表", access = "", required = true)
 	private List<StrRegion> strRegionList;
@@ -80,4 +83,11 @@ public class GroupReuse implements Serializable {
 		this.numRegionList = numRegionList;
 	}
 
+	public Integer getService() {
+		return service;
+	}
+
+	public void setService(Integer service) {
+		this.service = service;
+	}
 }

src/main/java/com/nis/domain/restful/IpRegion.java

@@ -16,59 +16,62 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
 /**
-* @ClassName: StrRegion 
+ * @ClassName: StrRegion
-* @Description: TODO(这里用一句话描述这个类的作用) 
+ * @Description: TODO(这里用一句话描述这个类的作用)
-* @author (darnell)  
+ * @author (darnell)
-* @date 2016年8月29日 下午10:29:45 
+ * @date 2016年8月29日 下午10:29:45
-* @version V1.0 
+ * @version V1.0
-*/
+ */
 public class IpRegion implements Serializable {
 
 	/**
-	* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) 
+	 * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
-	*/ 
+	 */
 	private static final long serialVersionUID = 1L;
-	@ApiModelProperty(value="域ID", required=true)
+	@ApiModelProperty(value = "域ID", required = true)
 	private Long regionId;
-	@ApiModelProperty(value="分组ID", required=true)
+	@ApiModelProperty(value = "分组ID", required = true)
 	private Long groupId;
 
-	@ApiModelProperty(value="业务表名称", required=true)
+	@ApiModelProperty(value = "业务表名称", required = true)
 	private String tableName;
 
-	@ApiModelProperty(value="地址类型", required=true)
+	@ApiModelProperty(value = "地址类型", required = true)
 	private Integer addrType;
-	@ApiModelProperty(value="源IP", required=true)
+	@ApiModelProperty(value = "源IP", required = true)
 	private String srcIp;
-	@ApiModelProperty(value="源IP掩码", required=true)
+	@ApiModelProperty(value = "源IP掩码", required = true)
 	private String maskSrcIp;
-	@ApiModelProperty(value="源端口", required=true)
+	@ApiModelProperty(value = "源端口", required = true)
 	private String srcPort;
-	@ApiModelProperty(value="源端口掩码", required=true)
+	@ApiModelProperty(value = "源端口掩码", required = true)
 	private String maskSrcPort;
-	@ApiModelProperty(value="目的IP", required=true)
+	@ApiModelProperty(value = "目的IP", required = true)
 	private String dstIp;
-	@ApiModelProperty(value="目的IP掩码", required=true)
+	@ApiModelProperty(value = "目的IP掩码", required = true)
 	private String maskDstIp;
-	@ApiModelProperty(value="目的端口", required=true)
+	@ApiModelProperty(value = "目的端口", required = true)
 	private String dstPort;
-	@ApiModelProperty(value="目的端口掩码", required=true)
+	@ApiModelProperty(value = "目的端口掩码", required = true)
 	private String maskDstPort;
-	@ApiModelProperty(value="协议", required=true)
+	@ApiModelProperty(value = "协议", required = true)
 	private Integer protocol;
-	@ApiModelProperty(value="方向", required=true)
+	@ApiModelProperty(value = "方向", required = true)
 	private Integer direction;
-	@ApiModelProperty(value="有效标志", required=true)
+	@ApiModelProperty(value = "有效标志", required = true)
 	private Integer isValid;
-	@ApiModelProperty(value="操作时间", required=true)
+	@ApiModelProperty(value = "操作时间", required = true)
-	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date opTime;
-	@ApiModelProperty(value="版本序列号", required=true)
+	@ApiModelProperty(value = "版本序列号", required = true)
 	private Long procSeq;
 
 	@ApiModelProperty(value = "本地更新时间	", required = true)
 	private Date lastUpdate;
 
+	// 为app协议ip业务添加userregion字段,该业务的ip域需要下发到阀门中,阀门需要userregion字段,校验时需要校验当为app协议ip业务时userregion字段不能为空
+	@ApiModelProperty(value = "用户自定义域", required = true)
+	private String userRegion;
 
 	@JsonIgnore
 	public Long getProcSeq() {
@@ -78,6 +81,7 @@ public class IpRegion implements Serializable {
 	public void setProcSeq(Long procSeq) {
 		this.procSeq = procSeq;
 	}
+
 	@JsonIgnore
 	public Date getLastUpdate() {
 		return lastUpdate;
@@ -88,211 +92,226 @@ public class IpRegion implements Serializable {
 	}
 
 	/**
-	* @return regionId 
+	 * @return regionId
-	*/
+	 */
 	public Long getRegionId() {
 		return regionId;
 	}
 
 	/**
-	* @param regionId 要设置的 regionId 
+	 * @param regionId
-	*/
+	 *            要设置的 regionId
+	 */
 	public void setRegionId(Long regionId) {
 		this.regionId = regionId;
 	}
 
 	/**
-	* @return groupId 
+	 * @return groupId
-	*/
+	 */
 	public Long getGroupId() {
 		return groupId;
 	}
 
 	/**
-	* @param groupId 要设置的 groupId 
+	 * @param groupId
-	*/
+	 *            要设置的 groupId
+	 */
 	public void setGroupId(Long groupId) {
 		this.groupId = groupId;
 	}
 
 	/**
-	* @return addrType 
+	 * @return addrType
-	*/
+	 */
 	public Integer getAddrType() {
 		return addrType;
 	}
 
 	/**
-	* @param addrType 要设置的 addrType 
+	 * @param addrType
-	*/
+	 *            要设置的 addrType
+	 */
 	public void setAddrType(Integer addrType) {
 		this.addrType = addrType;
 	}
 
 	/**
-	* @return srcIp 
+	 * @return srcIp
-	*/
+	 */
 	public String getSrcIp() {
 		return srcIp;
 	}
 
 	/**
-	* @param srcIp 要设置的 srcIp 
+	 * @param srcIp
-	*/
+	 *            要设置的 srcIp
+	 */
 	public void setSrcIp(String srcIp) {
 		this.srcIp = srcIp;
 	}
 
 	/**
-	* @return maskSrcIp 
+	 * @return maskSrcIp
-	*/
+	 */
 	public String getMaskSrcIp() {
 		return maskSrcIp;
 	}
 
 	/**
-	* @param maskSrcIp 要设置的 maskSrcIp 
+	 * @param maskSrcIp
-	*/
+	 *            要设置的 maskSrcIp
+	 */
 	public void setMaskSrcIp(String maskSrcIp) {
 		this.maskSrcIp = maskSrcIp;
 	}
 
 	/**
-	* @return srcPort 
+	 * @return srcPort
-	*/
+	 */
 	public String getSrcPort() {
 		return srcPort;
 	}
 
 	/**
-	* @param srcPort 要设置的 srcPort 
+	 * @param srcPort
-	*/
+	 *            要设置的 srcPort
+	 */
 	public void setSrcPort(String srcPort) {
 		this.srcPort = srcPort;
 	}
 
 	/**
-	* @return maskSrcPort 
+	 * @return maskSrcPort
-	*/
+	 */
 	public String getMaskSrcPort() {
 		return maskSrcPort;
 	}
 
 	/**
-	* @param maskSrcPort 要设置的 maskSrcPort 
+	 * @param maskSrcPort
-	*/
+	 *            要设置的 maskSrcPort
+	 */
 	public void setMaskSrcPort(String maskSrcPort) {
 		this.maskSrcPort = maskSrcPort;
 	}
 
 	/**
-	* @return dstIp 
+	 * @return dstIp
-	*/
+	 */
 	public String getDstIp() {
 		return dstIp;
 	}
 
 	/**
-	* @param dstIp 要设置的 dstIp 
+	 * @param dstIp
-	*/
+	 *            要设置的 dstIp
+	 */
 	public void setDstIp(String dstIp) {
 		this.dstIp = dstIp;
 	}
 
 	/**
-	* @return maskDstIp 
+	 * @return maskDstIp
-	*/
+	 */
 	public String getMaskDstIp() {
 		return maskDstIp;
 	}
 
 	/**
-	* @param maskDstIp 要设置的 maskDstIp 
+	 * @param maskDstIp
-	*/
+	 *            要设置的 maskDstIp
+	 */
 	public void setMaskDstIp(String maskDstIp) {
 		this.maskDstIp = maskDstIp;
 	}
 
 	/**
-	* @return dstPort 
+	 * @return dstPort
-	*/
+	 */
 	public String getDstPort() {
 		return dstPort;
 	}
 
 	/**
-	* @param dstPort 要设置的 dstPort 
+	 * @param dstPort
-	*/
+	 *            要设置的 dstPort
+	 */
 	public void setDstPort(String dstPort) {
 		this.dstPort = dstPort;
 	}
 
 	/**
-	* @return maskDstPort 
+	 * @return maskDstPort
-	*/
+	 */
 	public String getMaskDstPort() {
 		return maskDstPort;
 	}
 
 	/**
-	* @param maskDstPort 要设置的 maskDstPort 
+	 * @param maskDstPort
-	*/
+	 *            要设置的 maskDstPort
+	 */
 	public void setMaskDstPort(String maskDstPort) {
 		this.maskDstPort = maskDstPort;
 	}
 
 	/**
-	* @return protocol 
+	 * @return protocol
-	*/
+	 */
 	public Integer getProtocol() {
 		return protocol;
 	}
 
 	/**
-	* @param protocol 要设置的 protocol 
+	 * @param protocol
-	*/
+	 *            要设置的 protocol
+	 */
 	public void setProtocol(Integer protocol) {
 		this.protocol = protocol;
 	}
 
 	/**
-	* @return direction 
+	 * @return direction
-	*/
+	 */
 	public Integer getDirection() {
 		return direction;
 	}
 
 	/**
-	* @param direction 要设置的 direction 
+	 * @param direction
-	*/
+	 *            要设置的 direction
+	 */
 	public void setDirection(Integer direction) {
 		this.direction = direction;
 	}
 
 	/**
-	* @return isValid 
+	 * @return isValid
-	*/
+	 */
 	public Integer getIsValid() {
 		return isValid;
 	}
 
 	/**
-	* @param isValid 要设置的 isValid 
+	 * @param isValid
-	*/
+	 *            要设置的 isValid
+	 */
 	public void setIsValid(Integer isValid) {
 		this.isValid = isValid;
 	}
 
 	/**
-	* @return opTime 
+	 * @return opTime
-	*/
+	 */
 	public Date getOpTime() {
 		return opTime;
 	}
 
 	/**
-	* @param opTime 要设置的 opTime 
+	 * @param opTime
-	*/
+	 *            要设置的 opTime
+	 */
 	public void setOpTime(Date opTime) {
 		this.opTime = opTime;
 	}
@@ -305,9 +324,12 @@ public class IpRegion implements Serializable {
 		this.tableName = tableName;
 	}
 
+	public String getUserRegion() {
+		return userRegion;
+	}
 
-	
+	public void setUserRegion(String userRegion) {
-	
+		this.userRegion = userRegion;
-	
+	}
 
 }