S/DNAT复用地址池配置属性修改.

src/main/java/com/nis/web/controller/BaseController.java

@@ -100,6 +100,7 @@ import com.nis.web.service.configuration.DnsIpCfgService;
 import com.nis.web.service.configuration.DnsResStrategyService;
 import com.nis.web.service.configuration.DomainService;
 import com.nis.web.service.configuration.FileTransferCfgService;
+import com.nis.web.service.configuration.GroupAreaService;
 import com.nis.web.service.configuration.HttpRedirectCfgService;
 import com.nis.web.service.configuration.InterceptCfgService;
 import com.nis.web.service.configuration.IpCfgService;
@@ -221,6 +222,8 @@ public class BaseController {
 	protected AsnPolicyCfgService asnPolicyCfgService;// asn 策略 service
 	@Autowired
 	protected AppMultiFeatureCfgService appMultiFeatureCfgService;
+	@Autowired
+	protected GroupAreaService groupAreaService;// 分组区域管理 service 
 	/**
 	 * 管理基础路径
 	 */

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

@@ -58,6 +58,8 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 	public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes,
 			@ModelAttribute("cfg")IpMultiplexPoolCfg cfg){
 		try{
+			// 设置省份信息
+			groupAreaService.setAreaCodeByGroupId(cfg);
 			
 			ipMultiplexPoolCfgService.saveOrUpdate(cfg);
 			
@@ -145,7 +147,7 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 		}
 		if(!StringUtil.isEmpty(ids)){
 			cfg = ipMultiplexPoolCfgService.getIpMultiplexPoolCfg(Long.valueOf(ids),null);
-			initFormCondition(model, cfg);
+			initUpdateFormCondition(model, cfg);
 		}else{
 			initFormCondition(model, cfg);
 		}
@@ -162,7 +164,10 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 	public String snatsaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes,
 			@ModelAttribute("cfg")IpMultiplexPoolCfg cfg){
 		try{
-			
+			// 设置省份信息
+			if(!StringUtil.isEmpty(cfg.getPolicyGroup())){
+				groupAreaService.setAreaCodeByGroupId(cfg);
+			}
 			ipMultiplexPoolCfgService.saveOrUpdate(cfg);
 			
 			addMessage(redirectAttributes,"save_success");
@@ -208,4 +213,29 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
 	}
 	
+	/**
+	 * 校验IP是否已存在
+	 * @param cfg
+	 * @param redirectAttributes
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = {"/checkIp"})
+	public boolean checkIp(IpMultiplexPoolCfg cfg, HttpServletRequest request, HttpServletResponse response){
+		// 修改
+		if(!StringUtil.isEmpty(cfg.getCfgId())){
+			IpMultiplexPoolCfg poolCfg = ipMultiplexPoolCfgService.getCfgInfo(cfg);
+			if(poolCfg != null && poolCfg.getDestIpAddress().equals(cfg.getDestIpAddress())){
+				return true;
+			}
+		}
+		cfg.setCfgId(null);
+		IpMultiplexPoolCfg poolCfg = ipMultiplexPoolCfgService.getCfgInfo(cfg);
+		if(poolCfg != null){
+			return false;
+		}
+		return true;
+	}
 }