From 2e8861d3fa0b85579cafab99d3ebfbff5de66bf4 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 27 Mar 2018 16:00:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=A0=B8=E6=88=90?= =?UTF-8?q?=E5=8A=9F/=E5=A4=B1=E8=B4=A5=E5=9C=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=B8=8A=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/configuration/ComplexStringCfgController.java | 5 ++++- .../nis/web/controller/configuration/IpCfgController.java | 5 ++++- .../nis/web/controller/configuration/NumCfgController.java | 4 +++- .../web/controller/configuration/StringCfgController.java | 4 +++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index e191d555d..3c1acc547 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -1,4 +1,5 @@ package com.nis.web.controller.configuration; +import java.lang.annotation.Target; import java.util.Date; import java.util.List; @@ -10,6 +11,7 @@ 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.bind.annotation.RequestMethod; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; @@ -207,6 +209,7 @@ public class ComplexStringCfgController extends BaseController{ public String auditStringCfg(String cfgName,ComplexkeywordCfg cfg,Model model) { model.addAttribute("cfgName", cfgName); model.addAttribute("audit", Constants.AUDIT_PAGE); + model.addAttribute("cfgType", "complex"); model.addAttribute("serviceId", cfg.getServiceId()); model.addAttribute("action", cfg.getAction()); try{ @@ -250,7 +253,7 @@ public class ComplexStringCfgController extends BaseController{ logger.error("发生异常",e); addMessage(model,"审核失败！"); } - return "redirect:" + adminPath + "/cfg/complex/list"; + return "/cfg/resultPage"; } /** * diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index 33bb115e3..45bb1c374 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -12,6 +12,8 @@ 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.bind.annotation.RequestMethod; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; @@ -277,6 +279,7 @@ public class IpCfgController extends BaseController{ @RequestMapping(value = {"auditCfg"}) public String auditIpCfg(String cfgName,BaseIpCfg ipCfg,Model model) { model.addAttribute("cfgName", cfgName); + model.addAttribute("cfgType", "ip"); model.addAttribute("audit", Constants.AUDIT_PAGE); model.addAttribute("serviceId", ipCfg.getServiceId()); model.addAttribute("action", ipCfg.getAction()); @@ -321,7 +324,7 @@ public class IpCfgController extends BaseController{ logger.error("审核失败", e); addMessage(model, "审核失败"); } - return "redirect:" + adminPath + "/cfg/ip/list"; + return "/cfg/resultPage"; } /** * diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index da174fdd3..5e940155d 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -9,6 +9,7 @@ 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.bind.annotation.RequestMethod; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; @@ -177,6 +178,7 @@ public class NumCfgController extends BaseController{ public String auditStringCfg(String cfgName,NumBoundaryCfg cfg,Model model) { model.addAttribute("cfgName", cfgName); model.addAttribute("audit", Constants.AUDIT_PAGE); + model.addAttribute("cfgType","num"); model.addAttribute("serviceId", cfg.getServiceId()); model.addAttribute("action", cfg.getAction()); try{ @@ -215,7 +217,7 @@ public class NumCfgController extends BaseController{ logger.error("审核失败",e); addMessage(model, "审核失败"); } - return "redirect:" + adminPath + "/cfg/num/list"; + return "/cfg/resultPage"; } /** * diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java index cd0a9d273..0a4ad8a20 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -10,6 +10,7 @@ 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.bind.annotation.RequestMethod; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; @@ -212,6 +213,7 @@ public class StringCfgController extends BaseController{ public String auditStringCfg(String cfgName,BaseStringCfg stringCfg,Model model) { model.addAttribute("cfgName", cfgName); model.addAttribute("audit", Constants.AUDIT_PAGE); + model.addAttribute("cfgType","string"); model.addAttribute("serviceId", stringCfg.getServiceId()); model.addAttribute("action", stringCfg.getAction()); try{ @@ -258,7 +260,7 @@ public class StringCfgController extends BaseController{ logger.error("审核失败", e); addMessage(model,"审核失败！"); } - return "redirect:" + adminPath + "/cfg/string/list"; + return "/cfg/resultPage"; } /** *