From d7807f000968857ff6ccd30e0572c09e26f308af Mon Sep 17 00:00:00 2001 From: leijun Date: Wed, 16 Jan 2019 18:49:44 +0800 Subject: [PATCH] =?UTF-8?q?DNAT=E5=A4=8D=E7=94=A8=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=92=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E8=B0=83=E6=95=B4SNAT=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=B1=A0=E7=AE=A1=E7=90=86=20=E9=85=8D=E7=BD=AEIP=E7=9A=84?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=BA=EF=BC=9AIP=20sql=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/IpReuseDnatPolicyCfg.java | 25 ++++++- .../configuration/IpReusePolicyCfg.java | 2 +- .../manipulation/IpMultiplexController.java | 17 ++++- .../web/dao/configuration/IpMultiplexDao.xml | 40 +++++++---- .../sql/20190110/update_region_dict.sql | 2 + .../maintenance/ipMultiplexPool/snatform2.jsp | 33 ++++++++- .../maintenance/ipMultiplexPool/snatlist2.jsp | 1 - .../ipmulitiplex/dnatPolicyForm2.jsp | 35 +++++++++- .../ipmulitiplex/dnatPolicyList2.jsp | 67 ++++++++++++++++++- .../ipmulitiplex/snatPolicyForm2.jsp | 3 +- .../ipmulitiplex/snatPolicyList2.jsp | 8 +-- 11 files changed, 203 insertions(+), 30 deletions(-) create mode 100644 src/main/resources/sql/20190110/update_region_dict.sql diff --git a/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java b/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java index 124bb0bd8..d6019f748 100644 --- a/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java @@ -40,7 +40,7 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{ @Expose @SerializedName("translatedDestIp") - @ExcelField(title="translated_dest_ip",sort=6) + //@ExcelField(title="translated_dest_ip",sort=6) private String destIpAddress; @Expose @@ -54,8 +54,31 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{ @Expose @SerializedName("effectiveRange") private String areaEffectiveIds; + @ExcelField(title="user",sort=10) + @Expose + private String translatedUserId; + @Expose + @ExcelField(title="user_type",sort=9) + private String translatedUserType; + + public String getTranslatedUserId() { + return translatedUserId; + } + + public void setTranslatedUserId(String translatedUserId) { + this.translatedUserId = translatedUserId; + } + + public String getTranslatedUserType() { + return translatedUserType; + } + + public void setTranslatedUserType(String translatedUserType) { + this.translatedUserType = translatedUserType; + } + public String getIndexTable() { return indexTable; } diff --git a/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java b/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java index f6371c9d8..ae476f29d 100644 --- a/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java @@ -36,7 +36,7 @@ public class IpReusePolicyCfg extends BaseCfg{ private Integer ipType; private Integer ipPattern; - @ExcelField(title="ip",sort=6) + //@ExcelField(title="ip",sort=6) private String srcIpAddress; private String destIpAddress; @Expose diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index ba21d0979..53f00fbaf 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -343,6 +343,10 @@ public class IpMultiplexController extends CommonController { Page page = ipMultiplexService.findPageDnat(new Page(request, response, "r"), cfg); model.addAttribute("page", page); + + // 获取用户信息 地址池信息 + List users = userManageService.findUsers(); + model.addAttribute("users", users); initFormCondition(model, cfg); return "/cfg/manipulation/ipmulitiplex/dnatPolicyList2"; @@ -363,6 +367,10 @@ public class IpMultiplexController extends CommonController { } else { initFormCondition(model, cfg); } + + // 获取用户信息 地址池信息 + List users = userManageService.findUsers(); + model.addAttribute("users", users); model.addAttribute("_cfg", cfg); return "/cfg/manipulation/ipmulitiplex/dnatPolicyForm2"; } @@ -581,7 +589,14 @@ public class IpMultiplexController extends CommonController { logTotal.put("sum",0L); logTotals.add(logTotal); } - + IpReuseDnatPolicyCfg dnat=(IpReuseDnatPolicyCfg) cfg; + if(dnat.getTranslatedUserType().equals("VPN")){ + dnat.setTranslatedUserType(msgProp.getProperty("policy_vpn_user","VPN")); + }else if(dnat.getTranslatedUserType().equals("SIPv4")){ + dnat.setTranslatedUserType(msgProp.getProperty("policy_sipv4_user","SIPv4")); + }else if(dnat.getTranslatedUserType().equals("SIPv6")){ + dnat.setTranslatedUserType(msgProp.getProperty("policy_sipv6_user","SIPv6")); + } } StringBuilder serviceIds=new StringBuilder(","); for (Integer id : set) { diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml index a672f431c..527712ca7 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml @@ -45,7 +45,7 @@ - + @@ -73,6 +73,9 @@ + + + @@ -86,11 +89,11 @@ a.cfg_id,a.cfg_desc,a.ip_type,a.original_dest_ip,a.ip_pattern,a.port_pattern,a.original_dest_port, - a.protocol,a.protocol_id,a.cfg_type,a.action,a.translated_dest_port,a.translated_dest_ip,a.is_valid, + a.protocol,a.protocol_id,a.cfg_type,a.action,a.translated_dest_port,a.is_valid, a.is_audit,a.creator_id,a.create_time,a.editor_id,a.edit_time,a.auditor_id,a.audit_time, a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable, a.area_effective_ids,a.function_id,a.cfg_region_code,a.user_region1,a.user_region2, - a.user_region3,a.user_region4,a.user_region5 + a.user_region3,a.user_region4,a.user_region5,a.translated_user_type,a.translated_user_id checked> @@ -176,6 +177,32 @@ var resetIndex = function(){ + + +
+ +
+ + +

@@ -227,7 +254,7 @@ var resetIndex = function(){
-
+