From c224080ef9cb077a01fc6d9364040738a6fa45d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Mon, 15 Apr 2019 09:50:52 +0800
Subject: [PATCH] =?UTF-8?q?IP=E5=9C=B0=E5=9D=80=E6=96=B0=E5=A2=9E=E5=90=8E?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=95=88=E5=8F=8A=E7=83=AD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/ntc/IpController.java       | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

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 77dd1c3f3..d78bbf56a 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
@@ -108,7 +108,22 @@ public class IpController extends BaseController{
 	}
 	@RequestMapping(value = {"saveOrUpdate"})
 	public String saveOrUpdate(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
-		ipCfgService.saveIpCfg(entity);
+		try {
+				ipCfgService.saveIpCfg(entity);
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
+				addMessage(model, "success", "save_success");
+			}else {
+			//配置直接生效
+				addMessage(model, "success", "audit_success");
+			}
+		} catch (MaatConvertException e) {
+			logger.error("ip地址配置下发失败：",e);
+			addMessage(model, "error", "request_service_failed");
+		} catch (Exception e) {
+			logger.error("ip地址配置保存失败：",e);
+			addMessage(model, "error", "save_failed");
+		}
 		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 	}
 	@RequestMapping(value = {"ajaxSubList"})
@@ -151,8 +166,27 @@ public class IpController extends BaseController{
 	}
 	@RequestMapping(value = {"updateValid"})
 	@RequiresPermissions("iplist:config")
-	public String updateIpPortCfgValid(Integer isValid,String ids,Integer functionId) {
-		ipCfgService.updateIpCfgValid(isValid, ids, functionId);
+	public String updateIpPortCfgValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes,
+			HttpServletRequest request, HttpServletResponse response, @ModelAttribute("cfg")CfgIndexInfo cfg) {
+		try {
+			if (!StringUtil.isEmpty(ids)) {
+				ipCfgService.updateIpCfgValid(isValid, ids, functionId);
+				addMessage(redirectAttributes, "success", "delete_success");
+			}else {
+				// 批量删除
+				Page<CfgIndexInfo> searchPage = new Page<CfgIndexInfo>(request, response, "a");
+				deleteAll(searchPage, functionId, cfg);
+			}
+		} catch (Exception e) {
+			logger.error("配置删除失败：", e);
+			if (e instanceof MaatConvertException) {
+				addMessage(redirectAttributes, "error", "request_service_failed");
+			} else {
+				addMessage(redirectAttributes, "error", "delete_failed");
+			}
+
+		}
+		
 		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+functionId;
 	}
 	/**