From 8623619f219548920d16f32d3192bbc5cf2edc55 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 2 Jul 2018 11:13:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9contIp=20=E7=9A=84model?=
 =?UTF-8?q?=E4=B8=BAredirectAttribute=20contIpForm=E5=A2=9E=E5=8A=A0loadin?=
 =?UTF-8?q?g=E9=81=AE=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ntc/AvContentController.java              | 45 ++++++++++---------
 .../views/cfg/av/contIp/contIpForm.jsp        |  2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
index a64b120c2..770f9f366 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
@@ -52,26 +52,26 @@ import com.nis.web.security.UserUtils;
 public class AvContentController extends BaseController  {
 	/*****************************voip业务***************/
 	//音视频VOIP配置新增界面
-	@RequestMapping(value = {"/voipForm"})
-	@RequiresPermissions(value={"avVoip:config"})
-	public String voipFrom(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")CfgIndexInfo cfg){
-		if(!StringUtil.isEmpty(compileIds)){
-			cfg.setCompileId(Integer.parseInt(compileIds));
-			cfg = avContentCfgService.getCfgIndexInfo(cfg);
-			initUpdateFormCondition(model, cfg);
-		}else{
-			List<AvVoipAccountCfg> avVoipAccountCfgs=new ArrayList<AvVoipAccountCfg>();
-			avVoipAccountCfgs.add(new AvVoipAccountCfg());
-			cfg.setVoipAccounts(avVoipAccountCfgs);
-			List<AvVoipIpCfg> avVoipIpCfgs=new ArrayList<AvVoipIpCfg>();
-			avVoipIpCfgs.add(new AvVoipIpCfg());
-			cfg.setVoipIps(avVoipIpCfgs);
-			initFormCondition(model,cfg);
+		@RequestMapping(value = {"/voipForm"})
+		@RequiresPermissions(value={"avVoip:config"})
+		public String voipFrom(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")CfgIndexInfo cfg){
+			if(!StringUtil.isEmpty(compileIds)){
+				cfg.setCompileId(Integer.parseInt(compileIds));
+				cfg = avContentCfgService.getCfgIndexInfo(cfg);
+				initUpdateFormCondition(model, cfg);
+			}else{
+				List<AvVoipAccountCfg> avVoipAccountCfgs=new ArrayList<AvVoipAccountCfg>();
+				avVoipAccountCfgs.add(new AvVoipAccountCfg());
+				cfg.setVoipAccounts(avVoipAccountCfgs);
+				List<AvVoipIpCfg> avVoipIpCfgs=new ArrayList<AvVoipIpCfg>();
+				avVoipIpCfgs.add(new AvVoipIpCfg());
+				cfg.setVoipIps(avVoipIpCfgs);
+				initFormCondition(model,cfg);
+			}
+			
+			model.addAttribute("_cfg", cfg);
+			return "/cfg/av/voip/voipForm";
 		}
-		
-		model.addAttribute("_cfg", cfg);
-		return "/cfg/av/voip/voipForm";
-	}
 	
 	
 	//保存voip信息
@@ -184,14 +184,15 @@ public class AvContentController extends BaseController  {
 	@RequestMapping(value = {"/saveContIp"})
 	public String saveContIp(Model model,HttpServletRequest request,HttpServletResponse response,
 			@ModelAttribute("cfg")BaseIpCfg cfg,
-			@ModelAttribute("areaCfgIds")String areaCfgIds){
+			@ModelAttribute("areaCfgIds")String areaCfgIds
+			,RedirectAttributes redirectAttributes){
 		try{
 			avContentCfgService.saveOrUpdateContIp(cfg,areaCfgIds);
-			addMessage(model,"save_success");
+			addMessage(redirectAttributes,"save_success");
 		}catch(Exception e){
 			logger.error("信息保存失败",e);
 			e.printStackTrace();
-			addMessage(model,"save_failed");
+			addMessage(redirectAttributes,"save_failed");
 		}
 		
 		return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+cfg.getFunctionId();
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
index ea2b75fac..8dffa85f3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
@@ -19,7 +19,7 @@ $(function(){
 			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
 		},
 		submitHandler: function(form){
-			//loading('onloading...');
+			loading('onloading...');
 			form.submit();
 		},
 		errorContainer: "#messageBox",