diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index f3343d154..120600485 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -31,10 +31,15 @@ public class BaseCfg extends BaseEntity implements Cloneable{ protected String showName;//表在界面上展示的名称 protected String seltype;//选中类型,页面搜索用 protected String tableName; + @ExcelField(title="userregion1") protected String userRegion1; + @ExcelField(title="userregion2") protected String userRegion2; + @ExcelField(title="userregion3") protected String userRegion3; + @ExcelField(title="userregion4") protected String userRegion4; + @ExcelField(title="userregion5") protected String userRegion5; /** * 编译id diff --git a/src/main/java/com/nis/domain/configuration/IpCfgTemplate.java b/src/main/java/com/nis/domain/configuration/IpCfgTemplate.java index b3731fa9d..55cb57966 100644 --- a/src/main/java/com/nis/domain/configuration/IpCfgTemplate.java +++ b/src/main/java/com/nis/domain/configuration/IpCfgTemplate.java @@ -47,7 +47,82 @@ public class IpCfgTemplate { private Integer ratelimit;//21 private Integer dnsStrategyId;//22 private Integer irType;//23 + private String userRegion1;//77 + private String userRegion2;//78 + private String userRegion3;//79 + private String userRegion4;//80 + private String userRegion5;//81 + /** + * userRegion1 + * @return userRegion1 + */ + @ExcelField(title="userregion1",align=2,sort=77) + public String getUserRegion1() { + return userRegion1; + } + /** + * @param userRegion1 the userRegion1 to set + */ + public void setUserRegion1(String userRegion1) { + this.userRegion1 = userRegion1; + } + /** + * userRegion2 + * @return userRegion2 + */ + @ExcelField(title="userregion2",align=2,sort=78) + public String getUserRegion2() { + return userRegion2; + } + /** + * @param userRegion2 the userRegion2 to set + */ + public void setUserRegion2(String userRegion2) { + this.userRegion2 = userRegion2; + } + /** + * userRegion3 + * @return userRegion3 + */ + @ExcelField(title="userregion3",align=2,sort=79) + public String getUserRegion3() { + return userRegion3; + } + /** + * @param userRegion3 the userRegion3 to set + */ + public void setUserRegion3(String userRegion3) { + this.userRegion3 = userRegion3; + } + /** + * userRegion4 + * @return userRegion4 + */ + @ExcelField(title="userregion4",align=2,sort=80) + public String getUserRegion4() { + return userRegion4; + } + /** + * @param userRegion4 the userRegion4 to set + */ + public void setUserRegion4(String userRegion4) { + this.userRegion4 = userRegion4; + } + /** + * userRegion5 + * @return userRegion5 + */ + @ExcelField(title="userregion5",align=2,sort=81) + public String getUserRegion5() { + return userRegion5; + } + /** + * @param userRegion5 the userRegion5 to set + */ + public void setUserRegion5(String userRegion5) { + this.userRegion5 = userRegion5; + } /** * ratelimit * @return ratelimit diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 6e98444f6..b5b9e3a01 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -37,6 +37,11 @@ + + + + + @@ -50,14 +55,14 @@ DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT, CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, - ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID,RATELIMIT,DNS_STRATEGY_ID,IR_TYPE + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID,RATELIMIT,DNS_STRATEGY_ID,IR_TYPE,USER_REGION1,USER_REGION2,USER_REGION3,USER_REGION4,USER_REGION5 CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT, DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT, CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, - ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID,RATELIMIT,DNS_STRATEGY_ID,IR_TYPE + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID,RATELIMIT,DNS_STRATEGY_ID,IR_TYPE,USER_REGION1,USER_REGION2,USER_REGION3,USER_REGION4,USER_REGION5 @@ -68,7 +73,12 @@ ${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime, ${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify, ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds,${page.alias}.FUNCTION_ID AS functionId,${page.alias}.RATELIMIT AS ratelimit, - ${page.alias}.DNS_STRATEGY_ID AS dnsStrategyId,${page.alias}.IR_TYPE AS irType + ${page.alias}.DNS_STRATEGY_ID AS dnsStrategyId,${page.alias}.IR_TYPE AS irType, + ${page.alias}.USER_REGION1 AS userRegion1, + ${page.alias}.USER_REGION2 AS userRegion2, + ${page.alias}.USER_REGION3 AS userRegion3, + ${page.alias}.USER_REGION4 AS userRegion4, + ${page.alias}.USER_REGION5 AS userRegion5 r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.CFG_REGION_CODE as cfgRegionCode,r.CFG_TYPE as cfgType, r.IP_TYPE as ipType, @@ -77,7 +87,12 @@ r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify, r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.AREA_EFFECTIVE_IDS AS areaEffectiveIds,r.FUNCTION_ID as functionId,r.RATELIMIT AS ratelimit, - r.DNS_STRATEGY_ID AS dnsStrategyId,r.IR_TYPE AS irType + r.DNS_STRATEGY_ID AS dnsStrategyId,r.IR_TYPE AS irType, + r.USER_REGION1 AS userRegion1, + r.USER_REGION2 AS userRegion2, + r.USER_REGION3 AS userRegion3, + r.USER_REGION4 AS userRegion4, + r.USER_REGION5 AS userRegion5 @@ -92,7 +107,7 @@ REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE, CLASSIFY,ATTRIBUTE,LABLE, AREA_EFFECTIVE_IDS,FUNCTION_ID,RATELIMIT, - DNS_STRATEGY_ID,IR_TYPE + DNS_STRATEGY_ID,IR_TYPE,USER_REGION1,USER_REGION2,USER_REGION3,USER_REGION4,USER_REGION5 #{cfgDesc,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},#{cfgType,jdbcType=VARCHAR}, @@ -105,7 +120,12 @@ #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER}, #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, #{areaEffectiveIds,jdbcType=VARCHAR}, #{functionId,jdbcType=INTEGER}, #{ratelimit,jdbcType=INTEGER}, - #{dnsStrategyId,jdbcType=INTEGER},#{irType,jdbcType=INTEGER} + #{dnsStrategyId,jdbcType=INTEGER},#{irType,jdbcType=INTEGER}, + #{userRegion1,jdbcType=VARCHAR}, + #{userRegion2,jdbcType=VARCHAR}, + #{userRegion3,jdbcType=VARCHAR}, + #{userRegion4,jdbcType=VARCHAR}, + #{userRegion5,jdbcType=VARCHAR} + + + + + +
+ + +
+
+ +
+ +
+
+
+
+ + <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index a3852e6fe..33370a4fd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -232,6 +232,10 @@ + + + + @@ -298,6 +302,16 @@ ${cfg.ratelimit}% + + + + + + + + + ${cfg.userRegion2 } + ${cfg.requestName }