From eb9443f7d021df324c35c6df5cbf01d777a4cb44 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 31 Jul 2018 12:53:01 +0800 Subject: [PATCH] =?UTF-8?q?ipsec=E9=85=8D=E7=BD=AE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=8C=E5=BD=93action=E4=B8=BAdrop=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8C=E6=89=8D=E6=9C=89=E5=8D=8F=E8=AE=AE50?= =?UTF-8?q?=E5=92=8C51=E9=85=8D=E7=BD=AE;=20=E5=BD=93action=20=E4=B8=BAmon?= =?UTF-8?q?it=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/ntc/IpController.java | 11 + .../webapp/WEB-INF/include/form/ipInfo.jsp | 2 +- .../webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp | 277 ++++++++++++++++++ 3 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index 839c6a736..496e6fe02 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -45,9 +45,20 @@ public class IpController extends CommonController{ @RequiresPermissions(value={"iplist:config"}) public String form(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) { this._ipForm(cfgName, model, ids, functionId, entity); + List specialFunctionIdList = DictUtils.getDictList("SPECIAL_FUNCTION_ID"); + String specialFunctionId=null; + for(SysDataDictionaryItem item:specialFunctionIdList) { + if(Integer.parseInt(item.getItemCode())==entity.getFunctionId().intValue()) { + specialFunctionId= item.getItemValue(); + break; + } + } model.addAttribute("dropAction",Constants.DROP_ACTION); model.addAttribute("urlPrefix","/ntc/iplist"); model.addAttribute("requiresPermissionPrefix","iplist"); + if(specialFunctionId!=null && "ipsec".equals(specialFunctionId)) { + return "/cfg/ipsec/ipForm"; + } return "/cfg/common/ipForm"; } @RequestMapping(value = {"saveOrUpdate"}) diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp index 07165882f..f9b04ac79 100644 --- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp @@ -24,7 +24,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp new file mode 100644 index 000000000..df9748de9 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp @@ -0,0 +1,277 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + +
+

+ +

+
+
+
+
+
+ + + +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+ + + +
+
+
+
+ +
+ + + + + + + + <%@include file="/WEB-INF/include/form/ipInfo.jsp" %> + + + <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %> +
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ + + <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> + + + + + <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+ + + \ No newline at end of file