summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author段冬梅 <[email protected]>2019-04-15 09:50:52 +0800
committer段冬梅 <[email protected]>2019-04-15 09:50:52 +0800
commitc224080ef9cb077a01fc6d9364040738a6fa45d7 (patch)
tree55b25f54e253591682b8de9350d168281cdce0f1
parent47029f0eaf250549d6235c90077dc070621fddb5 (diff)
IP地址新增后直接生效及热修改功能
-rw-r--r--src/main/java/com/nis/web/controller/configuration/ntc/IpController.java40
1 files 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;
}
/**