diff --git a/src/main/java/com/nis/domain/configuration/IpMultiplexPoolCfg.java b/src/main/java/com/nis/domain/configuration/IpMultiplexPoolCfg.java index c9ecc9109..f8cb08dbd 100644 --- a/src/main/java/com/nis/domain/configuration/IpMultiplexPoolCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpMultiplexPoolCfg.java @@ -27,7 +27,7 @@ public class IpMultiplexPoolCfg extends BaseCfg { private Integer protocol; @Expose @SerializedName("ip") - private String srcIpAddress; + private String destIpAddress; @Expose private String port; @Expose @@ -58,11 +58,12 @@ public class IpMultiplexPoolCfg extends BaseCfg { this.protocol = protocol; } - public String getSrcIpAddress() { - return srcIpAddress; + + public String getDestIpAddress() { + return destIpAddress; } - public void setSrcIpAddress(String srcIpAddress) { - this.srcIpAddress = srcIpAddress; + public void setDestIpAddress(String destIpAddress) { + this.destIpAddress = destIpAddress; } public String getPort() { return port; diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java index 735e5e833..247052d35 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java @@ -47,9 +47,8 @@ public class IpMultiplexPoolCfgController extends BaseController { } //查询ip复用地址池配置的policyGroup列表 - List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2); + List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(3); model.addAttribute("policyGroups", policyGroups); - model.addAttribute("_cfg", cfg); return "/cfg/maintenance/ipMultiplexPool/form"; } @@ -92,7 +91,6 @@ public class IpMultiplexPoolCfgController extends BaseController { }catch(Exception e){ addMessage(redirectAttributes,"delete_failed"); } - return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+functionId; } @@ -125,4 +123,89 @@ public class IpMultiplexPoolCfgController extends BaseController { return true; } } + + @RequestMapping(value = {"/snatlist"}) + public String snatlist(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")IpMultiplexPoolCfg entity){ + //查询时left join policyGroup + Page page = ipMultiplexPoolCfgService.findPage(new Page(request, response,"r"), entity); + model.addAttribute("page", page); + initPageCondition(model,entity); + return "/cfg/maintenance/ipMultiplexPool/snatlist"; + } + + @RequestMapping(value = {"/snatform"}) + @RequiresPermissions(value={"ip:mulitiplex:pool:config"}) + public String snatfrom(Model model, + HttpServletRequest request, + HttpServletResponse response, + String ids, + @ModelAttribute("cfg")IpMultiplexPoolCfg cfg){ + if(cfg == null){ + cfg=new IpMultiplexPoolCfg(); + } + if(!StringUtil.isEmpty(ids)){ + cfg = ipMultiplexPoolCfgService.getIpMultiplexPoolCfg(Long.valueOf(ids),null); + initFormCondition(model, cfg); + }else{ + initFormCondition(model, cfg); + } + + //查询ip复用地址池配置的policyGroup列表 + List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2); + model.addAttribute("policyGroups", policyGroups); + model.addAttribute("_cfg", cfg); + return "/cfg/maintenance/ipMultiplexPool/snatform"; + } + + @RequestMapping(value = {"/snatsaveOrUpdate"}) + @RequiresPermissions(value={"ip:mulitiplex:pool:config"}) + public String snatsaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes, + @ModelAttribute("cfg")IpMultiplexPoolCfg cfg){ + try{ + + ipMultiplexPoolCfgService.saveOrUpdate(cfg); + + addMessage(redirectAttributes,"save_success"); + }catch(Exception e){ + e.printStackTrace(); + addMessage(redirectAttributes,"save_failed"); + } + + return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+cfg.getFunctionId(); + } + + @RequestMapping(value = {"/snataudit"}) + @RequiresPermissions(value={"ip:mulitiplex:pool:confirm"}) + public String snataudit(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) { + if(!StringUtil.isEmpty(ids)){ + String[] idArray = ids.split(","); + Date auditTime=new Date(); + for(String id :idArray){ + try { + ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime); + } catch (MaatConvertException e) { + e.printStackTrace(); + logger.info("SNAT地址池管理配置下发失败："+e.getMessage()); + addMessage(redirectAttributes, e.getMessage()); + } + } + + } + return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId; + } + @RequestMapping(value = {"/snatdelete"}) + @RequiresPermissions(value={"ip:mulitiplex:pool:config"}) + public String snatdelete(Integer isAudit,Integer isValid,String ids,Integer functionId,Model model,RedirectAttributes redirectAttributes + ,HttpServletRequest request,HttpServletResponse response){ + try{ + if(!StringUtil.isEmpty(ids)){ + ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId); + } + addMessage(redirectAttributes,"delete_success"); + }catch(Exception e){ + addMessage(redirectAttributes,"delete_failed"); + } + return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId; + } + } diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexPoolCfgDao.xml index a911869d3..3ac925b99 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexPoolCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexPoolCfgDao.xml @@ -7,7 +7,7 @@ - + @@ -72,8 +72,8 @@ AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') - - AND r.ip like concat(concat('%',#{srcIpAddress,jdbcType=VARCHAR}),'%') + + AND r.ip like concat(concat('%',#{destIpAddress,jdbcType=VARCHAR}),'%') AND a.group_name like concat(concat('%',#{groupName,jdbcType=VARCHAR}),'%') @@ -204,7 +204,7 @@ #{functionId,jdbcType=INTEGER}, #{ipType,jdbcType=INTEGER}, #{protocol,jdbcType=INTEGER}, - #{srcIpAddress,jdbcType=VARCHAR}, + #{destIpAddress,jdbcType=VARCHAR}, #{port,jdbcType=VARCHAR}, #{direction,jdbcType=INTEGER}, #{userRegion,jdbcType=VARCHAR}, @@ -277,8 +277,8 @@ protocol = #{protocol,jdbcType=INTEGER}, - - ip = #{srcIpAddress,jdbcType=VARCHAR}, + + ip = #{destIpAddress,jdbcType=VARCHAR}, port = #{port,jdbcType=VARCHAR}, diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp index f7642e389..078e9201a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp @@ -134,9 +134,10 @@
-

+ <%--

-

+ --%> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp index e40be5c15..b9ae7b36f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp @@ -5,8 +5,8 @@ <spring:message code="${cfgName}"></spring:message> + + + +
+<%--

+ +

--%> +
+
+
+
+
+ + + +
+
+
+ +
+ + + + + + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+
+ +
+ +
+
+
+
+
+
+ +
+
+ +
+ +
+
+
+
+
+ +
+ + <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> +
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp new file mode 100644 index 000000000..590a881bb --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp @@ -0,0 +1,442 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + +
+ + +

+ +

+
+
+
+
+
+ + + + + + + + + + +
+
+ + + + + + + <%-- --%> + +
+ +
+ +
+
+ + + + + + + + + +
+ + +
+ + + + + + + + + + + +
+ +
+
+
+ + + +
+
+ + + + + +
+ +
    +
    • +
    • +
    • +
+
+ + href="javascript:;"> + + +
+
+ + + +
+
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ +
+
+
+ + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+
+ + +
+ + + +
+ +
+ + + + + <%-- --%> + + + + + <%-- --%> + <%-- + --%> + <%-- + --%> + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + <%-- --%> + <%-- + --%> + <%-- + --%> + + + + + + + + <%-- --%> + + + + + + + + + + + + +
${cfg.compileId} + + ${fns:abbr(cfg.cfgDesc,20)} + + + + ${fns:abbr(cfg.groupName,20)} + + ${fns:abbr(cfg.destIpAddress, 42)}${cfg.port } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${cfg.requestName } + + + + + + + + + + + + + + + ${fns:abbr(classify,20)} + + + + + + + + + + + + + + + + + ${fns:abbr(attribute,20)} + + + + + + + + + + + + + + + + + ${fns:abbr(lableInfo,20)} + + ${cfg.areaEffectiveIds } + + + + ${cfg.creatorName }${cfg.editorName }${cfg.auditorName }
+
${page}
+
+
+
+
+
+ + + \ No newline at end of file