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"; } /** *