（1）IP控制提交

（2）Proxy IP类页面复用

src/main/java/com/nis/web/controller/configuration/CommonController.java

@@ -0,0 +1,114 @@
+/**
+ *@Title: CommonController.java
+ *@Package com.nis.web.controller.configuration 
+ *@Description TODO
+ *@author dell
+ *@date 2018年6月22日 下午6:35:37
+ *@version  版本号
+ */
+package com.nis.web.controller.configuration;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.ui.Model;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.nis.domain.Page;
+import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.IpPortCfg;
+import com.nis.exceptions.MaatConvertException;
+import com.nis.util.Constants;
+import com.nis.web.controller.BaseController;
+
+/**
+ * @ClassName: CommonController.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年6月22日 下午6:35:37
+ * @version V1.0
+ */
+public class CommonController extends BaseController {
+	public void _ipList(Model model,IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
+		cfg.setTableName(IpPortCfg.getTablename());
+		Page<BaseIpCfg> searchPage=new Page<BaseIpCfg>(request,response,"r");
+		Page<BaseIpCfg> page = ipCfgService.findPage(searchPage, cfg);
+		model.addAttribute("page", page);
+		initPageCondition(model,cfg);
+	}
+	public void _ipForm(Model model,String ids,Integer functionId,BaseIpCfg entity) {
+		if(StringUtils.isNotBlank(ids)){
+			entity = ipCfgService.getIpCfgById(IpPortCfg.getTablename(),Long.parseLong(ids));
+		}
+		if(entity.getCfgId()!=null){
+			model.addAttribute("_cfg", entity);
+			initUpdateFormCondition(model,entity);
+		}else{
+			IpPortCfg cfg=new IpPortCfg();
+			cfg.initDefaultValueImpl();
+			cfg.setFunctionId(entity.getFunctionId());
+			cfg.setProtocolId(entity.getProtocolId());
+			model.addAttribute("_cfg", cfg);
+			initFormCondition(model,entity);
+		}
+	}
+	public void _saveOrUpdateIp(RedirectAttributes model, IpPortCfg cfg) {
+		Date date=new Date();
+		cfg.setTableName(IpPortCfg.getTablename());
+		logger.info("saveOrUpdateIp loaded");
+		try{
+			cfg.setIsValid(Constants.VALID_NO);
+			cfg.setIsAudit(Constants.AUDIT_NOT_YET);
+			if(cfg.getCfgId()==null){//新增
+				cfg.setCreatorId(cfg.getCurrentUser().getId());
+				cfg.setCreateTime(date);
+				ipCfgService.addIpCfg(cfg);
+			}else{//修改
+				cfg.setEditorId(cfg.getCurrentUser().getId());
+				cfg.setEditTime(new Date());
+				ipCfgService.updateIpCfg(cfg);
+			} 
+			addMessage(model,"save_success");
+		}catch(Exception e){
+			logger.error("保存失败",e);
+			addMessage(model,"save_failed");
+		}
+	}
+	public void _deleteIp(String ids,String compileIds,Integer functionId,RedirectAttributes model) {
+		try{
+			ipCfgService.deleteIp(ids,compileIds,functionId.intValue());
+			addMessage(model,"delete_success");
+		}catch(Exception e){
+			logger.error("删除失败", e);
+			addMessage(model,"delete_failed");
+		}
+	}
+	public void _auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
+		try{
+			for(String id:ids.split(",")){
+				Long.parseLong(id);
+			}
+			List<BaseIpCfg> beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),cfg.getFunctionId().intValue(),ids);
+			Date date=new Date();
+			for(BaseIpCfg bean:beans){
+				bean.setTableName(IpPortCfg.getTablename());
+				bean.setAuditorId(bean.getCurrentUser().getId());
+				bean.setAuditTime(date);
+				bean.setIsAudit(cfg.getIsAudit());
+				bean.setIsValid(cfg.getIsValid());
+				ipCfgService.audit(bean);
+			}
+			addMessage(redirectAttributes,"audit_success");
+		}catch(MaatConvertException e){
+			logger.error("审核失败", e);
+			addMessage(redirectAttributes, e.getPrefix()+e.getResult().getReason());
+		}catch(Exception e){
+			logger.error("审核失败", e);
+			addMessage(redirectAttributes, "audit_failed");
+		}
+	}
+}

src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java

@@ -0,0 +1,81 @@
+/**
+ *@Title: ControlController.java
+ *@Package com.nis.web.controller.configuration.proxy 
+ *@Description TODO
+ *@author dell
+ *@date 2018年6月22日 下午4:35:42
+ *@version  版本号
+ */
+package com.nis.web.controller.configuration.proxy;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.nis.domain.Page;
+import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.IpPortCfg;
+import com.nis.exceptions.MaatConvertException;
+import com.nis.util.Constants;
+import com.nis.web.controller.BaseController;
+import com.nis.web.controller.configuration.CommonController;
+
+/**
+ * @ClassName: ControlController.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年6月22日 下午4:35:42
+ * @version V1.0
+ */
+@Controller
+@RequestMapping("${adminPath}/proxy/control")
+public class ControlController extends CommonController {
+	@RequestMapping(value = {"/ip/list"})
+	@RequiresPermissions(value={"control:ip:config","control:ip:audit"},logical=Logical.OR)
+	public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
+		this._ipList(model, cfg, request, response);
+		model.addAttribute("urlPrefix","/proxy/control");
+		model.addAttribute("requiresPermissionPrefix","control:ip");
+		return "/cfg/proxy/ipList";
+	}
+	@RequestMapping(value = {"/ip/form"})
+	@RequiresPermissions(value={"control:ip:config"})
+	public String ipForm(Model model,String ids,Integer functionId,BaseIpCfg entity) {
+		this._ipForm(model, ids, functionId, entity);
+		model.addAttribute("urlPrefix","/proxy/control");
+		model.addAttribute("requiresPermissionPrefix","control:ip");
+		return "/cfg/proxy/ipForm";
+	}
+	@RequestMapping(value = {"/ip/saveOrUpdate"})
+	public String saveOrUpdateIp(RedirectAttributes model, IpPortCfg cfg) {
+		this._saveOrUpdateIp(model, cfg);
+		return "redirect:" + adminPath +"/proxy/control/ip/list?functionId="+cfg.getFunctionId();
+	}
+	@RequestMapping(value = {"/ip/delete"})
+	@RequiresPermissions("control:ip:config")
+	public String deleteIp(String ids,String compileIds,Integer functionId,RedirectAttributes model) {
+		this._deleteIp(ids, compileIds, functionId, model);
+		model.addAttribute("urlPrefix","/proxy/control");
+		model.addAttribute("requiresPermissionPrefix","control:ip");
+		return "redirect:" + adminPath +"/proxy/control/ip/list?functionId="+functionId;
+	}
+	@RequestMapping(value = {"/ip/audit"})
+//	@RequiresPermissions("control:ip:audit")
+	public String auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
+		this._auditIp(ids, cfg, redirectAttributes);
+		redirectAttributes.addAttribute("urlPrefix","/proxy/control");
+		redirectAttributes.addAttribute("requiresPermissionPrefix","control:ip");
+		return "redirect:" + adminPath +"/proxy/control/ip/list?functionId="+cfg.getFunctionId();
+	}
+}

src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java

@@ -16,14 +16,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
-import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
-import com.nis.web.controller.BaseController;
+import com.nis.web.controller.configuration.CommonController;
 
 /**
  * IP相关配置控制类
@@ -32,15 +31,13 @@ import com.nis.web.controller.BaseController;
  */
 @Controller
 @RequestMapping("${adminPath}/proxy/intercept")
-public class InterceptController extends BaseController{
+public class InterceptController extends CommonController{
 	@RequestMapping(value = {"/ip/list"})
 	@RequiresPermissions(value={"intercept:ip:config","intercept:ip:audit"},logical=Logical.OR)
 	public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
-			cfg.setTableName(IpPortCfg.getTablename());
+			this._ipList(model, cfg, request, response);
-			Page<BaseIpCfg> searchPage=new Page<BaseIpCfg>(request,response,"r");
+			model.addAttribute("urlPrefix","/proxy/intercept");
-			Page<BaseIpCfg> page = ipCfgService.findPage(searchPage, cfg);
+			model.addAttribute("requiresPermissionPrefix","intercept:ip");
-			model.addAttribute("page", page);
-			initPageCondition(model,cfg);
 		return "/cfg/proxy/ipList";
 	}
 	@RequestMapping(value = {"/domain/list"})
@@ -56,23 +53,9 @@ public class InterceptController extends BaseController{
 	@RequestMapping(value = {"/ip/form"})
 	@RequiresPermissions(value={"intercept:ip:config"})
 	public String ipForm(Model model,String ids,Integer functionId,BaseIpCfg entity) {
-		if(StringUtils.isNotBlank(ids)){
+		this._ipForm(model, ids, functionId, entity);
-			entity = ipCfgService.getIpCfgById(IpPortCfg.getTablename(),Long.parseLong(ids));
+		model.addAttribute("urlPrefix","/proxy/intercept");
-		}
+		model.addAttribute("requiresPermissionPrefix","intercept:ip");
-		if(entity.getCfgId()!=null){
-//			List<BaseIpCfg> areaCfg=ipCfgService.getListByComileId(AreaIpCfg.getTablename(),functionId.intValue(), String.valueOf(entity.getCompileId()));
-//			model.addAttribute("areaCfgs", areaCfg);
-			model.addAttribute("_cfg", entity);
-			initUpdateFormCondition(model,entity);
-		}else{
-			IpPortCfg cfg=new IpPortCfg();
-			cfg.initDefaultValueImpl();
-			cfg.setFunctionId(entity.getFunctionId());
-			cfg.setProtocolId(entity.getProtocolId());
-			model.addAttribute("_cfg", cfg);
-			initFormCondition(model,entity);
-		}
-		
 		return "/cfg/proxy/ipForm";
 	}
 	@RequestMapping(value = {"/domain/form"})
@@ -98,26 +81,7 @@ public class InterceptController extends BaseController{
 	}
 	@RequestMapping(value = {"/ip/saveOrUpdate"})
 	public String saveOrUpdateIp(RedirectAttributes model, IpPortCfg cfg) {
-		Date date=new Date();
+		this._saveOrUpdateIp(model, cfg);
-		cfg.setTableName(IpPortCfg.getTablename());
-		logger.info("saveOrUpdateIp loaded");
-		try{
-			cfg.setIsValid(Constants.VALID_NO);
-			cfg.setIsAudit(Constants.AUDIT_NOT_YET);
-			if(cfg.getCfgId()==null){//新增
-				cfg.setCreatorId(cfg.getCurrentUser().getId());
-				cfg.setCreateTime(date);
-				ipCfgService.addIpCfg(cfg);
-			}else{//修改
-				cfg.setEditorId(cfg.getCurrentUser().getId());
-				cfg.setEditTime(new Date());
-				ipCfgService.updateIpCfg(cfg);
-			} 
-			addMessage(model,"save_success");
-		}catch(Exception e){
-			logger.error("保存失败",e);
-			addMessage(model,"save_failed");
-		}
 		return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+cfg.getFunctionId();
 	}
 	@RequestMapping(value = {"/domain/saveOrUpdate"})
@@ -147,13 +111,9 @@ public class InterceptController extends BaseController{
 	@RequestMapping(value = {"/ip/delete"})
 	@RequiresPermissions("intercept:ip:config")
 	public String deleteIp(String ids,String compileIds,Integer functionId,RedirectAttributes model) {
-		try{
+		this._deleteIp(ids, compileIds, functionId, model);
-			ipCfgService.deleteIp(ids,compileIds,functionId.intValue());
+		model.addAttribute("urlPrefix","/proxy/intercept");
-			addMessage(model,"delete_success");
+		model.addAttribute("requiresPermissionPrefix","intercept:ip");
-		}catch(Exception e){
-			logger.error("删除失败", e);
-			addMessage(model,"delete_failed");
-		}
 		return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId;
 	}
 	@RequestMapping(value = {"/domain/delete"})
@@ -171,28 +131,9 @@ public class InterceptController extends BaseController{
 	@RequestMapping(value = {"/ip/audit"})
 //	@RequiresPermissions("intercept:ip:audit")
 	public String auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
-		try{
+		this._auditIp(ids, cfg, redirectAttributes);
-			for(String id:ids.split(",")){
+		redirectAttributes.addAttribute("urlPrefix","/proxy/intercept");
-				Long.parseLong(id);
+		redirectAttributes.addAttribute("requiresPermissionPrefix","intercept:ip");
-			}
-			List<BaseIpCfg> beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),cfg.getFunctionId().intValue(),ids);
-			Date date=new Date();
-			for(BaseIpCfg bean:beans){
-				bean.setTableName(IpPortCfg.getTablename());
-				bean.setAuditorId(bean.getCurrentUser().getId());
-				bean.setAuditTime(date);
-				bean.setIsAudit(cfg.getIsAudit());
-				bean.setIsValid(cfg.getIsValid());
-				ipCfgService.audit(bean);
-			}
-			addMessage(redirectAttributes,"audit_success");
-		}catch(MaatConvertException e){
-			logger.error("审核失败", e);
-			addMessage(redirectAttributes, e.getPrefix()+e.getResult().getReason());
-		}catch(Exception e){
-			logger.error("审核失败", e);
-			addMessage(redirectAttributes, "audit_failed");
-		}
 		return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+cfg.getFunctionId();
 	}
 	@RequestMapping(value = {"/domain/audit"})

src/main/webapp/WEB-INF/views/cfg/proxy/ipList.jsp

@@ -66,9 +66,9 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<shiro:hasPermission name="iplist:config">
+		<shiro:hasPermission name="${requiresPermissionPrefix.concat(':config')}">
 			<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/proxy/intercept/ip/form?functionId=${cfg.functionId}'">
+			onClick="javascript:window.location='${ctx}${urlPrefix}/ip/form?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"></spring:message></button>
 		</shiro:hasPermission>
@@ -83,7 +83,7 @@
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/proxy/intercept/ip/list" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}${urlPrefix}/ip/list" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
@@ -126,20 +126,20 @@
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
-								 		<shiro:hasPermission name="iplist:config">
+								 		<shiro:hasPermission name="${requiresPermissionPrefix.concat(':config')}">
-									 		<sys:delRow url="${ctx}/proxy/intercept/ip/form?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
+									 		<sys:delRow url="${ctx}${urlPrefix}/ip/form?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
-	                                        <sys:delRow url="${ctx}/proxy/intercept/ip/delete?functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
+	                                        <sys:delRow url="${ctx}${urlPrefix}/ip/delete?functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
                                         </shiro:hasPermission>
-                                   		<shiro:hasPermission name="iplist:config">
+                                   		<shiro:hasPermission name="${requiresPermissionPrefix.concat(':config')}">
 	                                        <div class="btn-group">
 	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
 	                                                <i class="fa fa-angle-down"></i>
 	                                            </button>
 	                                            <ul class="dropdown-menu pull-right">
-	                                                <li><sys:delRow url="${ctx}/proxy/intercept/ip/audit?isAudit=1&isValid=1&functionId=${cfg.functionId}" id="contentTable" label="approved"></sys:delRow></li>
+	                                                <li><sys:delRow url="${ctx}${urlPrefix}/ip/audit?isAudit=1&isValid=1&functionId=${cfg.functionId}" id="contentTable" label="approved"></sys:delRow></li>
-													<li><sys:delRow url="${ctx}/proxy/intercept/ip/audit?isAudit=2&isValid=0&functionId=${cfg.functionId}" id="contentTable" label="unapproved"></sys:delRow></li>
+													<li><sys:delRow url="${ctx}${urlPrefix}/ip/audit?isAudit=2&isValid=0&functionId=${cfg.functionId}" id="contentTable" label="unapproved"></sys:delRow></li>
-													<li><sys:delRow url="${ctx}/proxy/intercept/ip/audit?isAudit=3&isValid=0&functionId=${cfg.functionId}" id="contentTable" label="cancelPass"></sys:delRow></li>            
+													<li><sys:delRow url="${ctx}${urlPrefix}/ip/audit?isAudit=3&isValid=0&functionId=${cfg.functionId}" id="contentTable" label="cancelPass"></sys:delRow></li>            
 	                                            </ul>
 	                                        </div>
                                         </shiro:hasPermission>