(1)IP类配置增加区域GK逻辑

(2)修复编译ID的重复获取BUG
(3)监测类配置目前不提供区域管控逻辑
This commit is contained in:
wangxin
2018-04-08 16:15:06 +08:00
parent 1f6bbc20ce
commit aaf8dd5afb
20 changed files with 1133 additions and 107 deletions

View File

@@ -0,0 +1,49 @@
/**
*@Title: AreaBean.java
*@Package com.nis.domain.configuration
*@Description TODO
*@author dell
*@date 2018年4月8日 上午10:06:11
*@version 版本号
*/
package com.nis.domain.configuration;
/**
* @ClassName: AreaBean.java
* @Description: TODO
* @author (dell)
* @date 2018年4月8日 上午10:06:11
* @version V1.0
*/
public class AreaBean {
private String area;
private String isp;
/**
* area
* @return area
*/
public String getArea() {
return area;
}
/**
* @param area the area to set
*/
public void setArea(String area) {
this.area = area;
}
/**
* isp
* @return isp
*/
public String getIsp() {
return isp;
}
/**
* @param isp the isp to set
*/
public void setIsp(String isp) {
this.isp = isp;
}
}

View File

@@ -16,6 +16,8 @@ package com.nis.domain.configuration;
* @version V1.0
*/
public class AreaIpCfg extends BaseIpCfg {
private static final String tableName="area_ip_cfg";
private static final String maatTable="DF_IP_RANGE";
/**
* @Fields serialVersionUID:TODO用一句话描述这个变量表示什么
*
@@ -53,5 +55,23 @@ public class AreaIpCfg extends BaseIpCfg {
this.isAreaEffective=0;
this.areaEffectiveIds=null;
}
/**
* tablename
* @return tablename
*/
public static String getTablename() {
return tableName;
}
/**
* maattable
* @return maattable
*/
public static String getMaattable() {
return maatTable;
}
}

View File

@@ -9,6 +9,7 @@
package com.nis.domain.configuration;
import java.util.Date;
import java.util.List;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
@@ -22,6 +23,9 @@ import com.nis.domain.BaseEntity;
* @version V1.0
*/
public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
protected Integer areaType;
protected List<AreaBean> areaIsp;
protected List<AreaIpCfg> areaCfg;
protected String showName;//表在界面上展示的名称
protected String seltype;//选中类型,页面搜索用
protected String tableName;
@@ -672,5 +676,60 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
// TODO Auto-generated method stub
return super.clone();
}
/**
* areaCfg
* @return areaCfg
*/
public List<AreaIpCfg> getAreaCfg() {
return areaCfg;
}
/**
* @param areaCfg the areaCfg to set
*/
public void setAreaCfg(List<AreaIpCfg> areaCfg) {
this.areaCfg = areaCfg;
}
/**
* showName
* @return showName
*/
public String getShowName() {
return showName;
}
/**
* @param showName the showName to set
*/
public void setShowName(String showName) {
this.showName = showName;
}
/**
* areaIsp
* @return areaIsp
*/
public List<AreaBean> getAreaIsp() {
return areaIsp;
}
/**
* @param areaIsp the areaIsp to set
*/
public void setAreaIsp(List<AreaBean> areaIsp) {
this.areaIsp = areaIsp;
}
/**
* areaType
* @return areaType
*/
public Integer getAreaType() {
return areaType;
}
/**
* @param areaType the areaType to set
*/
public void setAreaType(Integer areaType) {
this.areaType = areaType;
}
}

View File

@@ -25,6 +25,15 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
* @since 1.0.0
*/
private static final long serialVersionUID = -1939538118388300002L;
/**
* 创建一个新的实例 BaseIpCfg.
*
*/
public BaseIpCfg() {
super();
// TODO Auto-generated constructor stub
}
/**
* ip类型
*/