完善IP复用地址池、策略配置.

src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java

@@ -65,8 +65,6 @@ public class IpAddrPoolController extends BaseController{
 		}
 		if(!StringUtil.isEmpty(ids)){
 			cfg = ipAddrPoolCfgService.getIpAddrPoolCfg(Long.valueOf(ids),null);
-			PolicyGroupInfo groupInfo = policyGroupInfoService.getById(cfg.getAddrPoolId());
-			cfg.setAddrPoolName(groupInfo.getGroupName());
 			initUpdateFormCondition(model, cfg);
 		}else{
 			initFormCondition(model, cfg);
@@ -81,17 +79,7 @@ public class IpAddrPoolController extends BaseController{
 	public String snatSaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes,
 									@ModelAttribute("cfg")IpAddrPoolCfg cfg){
 		try{
-			// 保存地址池信息 -> policy_group_info
-			PolicyGroupInfo entity = new PolicyGroupInfo();
-			if(cfg.getAddrPoolId() != null){
-				entity.setGroupId(cfg.getAddrPoolId());
-			}
-			entity.setGroupType(2);
-			entity.setGroupName(cfg.getAddrPoolName());
-			entity.setDescription(cfg.getDescription());
-			policyGroupInfoService.saveOrUpdate(entity);
-			cfg.setAddrPoolId(policyGroupInfoService.getGroupIdByGroupName(cfg.getAddrPoolName()));
-			
+			// 添加地址池配置信息
 			ipAddrPoolCfgService.saveOrUpdate(cfg, request, response);
 			addMessage(redirectAttributes,"success","save_success");
 		}catch(Exception e) {
@@ -130,13 +118,24 @@ public class IpAddrPoolController extends BaseController{
 		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
 	}
 	
+	/**
+	 * 配置删除
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids
+	 * @param functionId
+	 * @param model
+	 * @param redirectAttributes
+	 * @param request
+	 * @param response
+	 * @return
+	 */
 	@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)){
-				// ?未被任何策略引用的地址池可删除
 				ipAddrPoolCfgService.delete(isAudit,isValid,ids,functionId);
 			}
 			addMessage(redirectAttributes,"success","delete_success");