1、回调类中改为属于策略一部分无action;

2、添加分组复用域配置新增和删除接口;只有属于分组复用的业务类型在新增MAAT规则时才能只不填写域配置;
This commit is contained in:
zhangdongxu
2018-08-23 20:48:49 +08:00
parent 2789f3ebf2
commit 28f5e0ba36
12 changed files with 1488 additions and 209 deletions

View File

@@ -0,0 +1,103 @@
/**
* @Title: DfConfigCompile.java
* @Package com.nis.domain.restful
* @Description: TODO(用一句话描述该文件做什么)
* @author darnell
* @date 2016年8月29日 下午9:36:28
* @version V1.0
*/
package com.nis.domain.restful;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.wordnik.swagger.annotations.ApiModelProperty;
/**
*
* @ClassName:RegionRepeat
* @Description:TODO(这里用一句话描述这个类的作用)
* @author (zdx)
* @date 2018年8月22日 下午6:57:42
* @version V1.0
*/
public class GroupReuse implements Serializable {
private static final long serialVersionUID = 5803814776173252917L;
@ApiModelProperty(value = "业务ID", required = true)
private Integer service;
@ApiModelProperty(value = "字符串域分组列表", access = "", required = true)
private List<StrRegion> strRegionList;
@ApiModelProperty(value = "IP域分组列表", required = true)
private List<IpRegion> ipRegionList;
@ApiModelProperty(value = "数值域分组列表", required = true)
private List<NumRegion> numRegionList;
/**
* @return service
*/
public Integer getService() {
return service;
}
/**
* @param service
* 要设置的 service
*/
public void setService(Integer service) {
this.service = service;
}
/**
* @return strRegionList
*/
public List<StrRegion> getStrRegionList() {
return strRegionList;
}
/**
* @param strRegionList
* 要设置的 strRegionList
*/
public void setStrRegionList(List<StrRegion> strRegionList) {
this.strRegionList = strRegionList;
}
/**
* @return ipRegionList
*/
public List<IpRegion> getIpRegionList() {
return ipRegionList;
}
/**
* @param ipRegionList
* 要设置的 ipRegionList
*/
public void setIpRegionList(List<IpRegion> ipRegionList) {
this.ipRegionList = ipRegionList;
}
/**
* @return numRegionList
*/
@ApiModelProperty(value = "数值域分组列表", required = true)
public List<NumRegion> getNumRegionList() {
return numRegionList;
}
/**
* @param numRegionList
* 要设置的 numRegionList
*/
public void setNumRegionList(List<NumRegion> numRegionList) {
this.numRegionList = numRegionList;
}
}

View File

@@ -0,0 +1,119 @@
/**
* @Title: ConfigSource.java
* @Package com.nis.domain.restful
* @Description: TODO(用一句话描述该文件做什么)
* @author darnell
* @date 2016年8月29日 下午9:31:24
* @version V1.0
*/
package com.nis.domain.restful;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.nis.util.JsonDateDeserializer;
import com.nis.util.JsonDateSerializer;
/**
* @ClassName:RegionRepeatSource
* @Description:TODO(这里用一句话描述这个类的作用)
* @author (zdx)
* @date 2018年8月22日 下午7:03:36
* @version V1.0
*/
public class GroupReuseSource extends ConfigCommonSource{
private static final long serialVersionUID = -7543263486915343526L;
private static final String DEFAULT_VERSION = "1.0";
private List<GroupReuse> groupReuseList; //分组复用域配置列表
/**
* @Title:
* @Description: TODO
* @param
*/
public GroupReuseSource() {
this.version = DEFAULT_VERSION;
}
public GroupReuseSource(String Version) {
this.version = Version;
}
/**
* @return version
*/
public String getVersion() {
return version;
}
/**
* @param version 要设置的 version
*/
public void setVersion(String version) {
this.version = version;
}
/**
* @return operator
*/
public String getOperator() {
return operator;
}
/**
* @param operator 要设置的 operator
*/
public void setOperator(String operator) {
this.operator = operator;
}
/**
* @return opTime
*/
@JsonSerialize(using=JsonDateSerializer.class)
public Date getOpTime() {
return opTime;
}
/**
* @param opTime 要设置的 opTime
*/
@JsonDeserialize(using=JsonDateDeserializer.class)
public void setOpTime(Date opTime) {
this.opTime = opTime;
}
/**
* @return opAction
*/
public Integer getOpAction() {
return opAction;
}
/**
* @param opAction 要设置的 opAction
*/
public void setOpAction(Integer opAction) {
this.opAction = opAction;
}
/**
* @return the groupReuseList
*/
public List<GroupReuse> getGroupReuseList() {
return groupReuseList;
}
/**
* @param groupReuseList the groupReuseList to set
*/
public void setGroupReuseList(List<GroupReuse> groupReuseList) {
this.groupReuseList = groupReuseList;
}
}