diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 4fa813bfc..f913f711b 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -345,7 +345,13 @@ public class AvController extends BaseController { RedirectAttributes redirectAttributes, String ids, AvSignSampleCfg entity) { try { avCfgService.saveOrUpdateAvSignSample(entity); - addMessage(redirectAttributes, "success", "save_success"); + //配置仅保存 + if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) { + addMessage(redirectAttributes, "success", "save_success"); + }else { + //配置直接生效 + addMessage(redirectAttributes, "success", "audit_success"); + } } catch (Exception e) { logger.error("saveAudioSignSample failed", e); e.printStackTrace(); @@ -597,7 +603,13 @@ public class AvController extends BaseController { // if(!avSignSampleCfg.getAction().equals(avSignSampleCfg.getActionOld())||!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){ try { avCfgService.auditAvSignSample(avSignSampleCfg); - addMessage(redirectAttributes, "success", "save_success"); + //配置仅保存 + if(StringUtil.isEmpty(avSignSampleCfg.getIsValid()) || avSignSampleCfg.getIsValid()!=1) { + addMessage(redirectAttributes, "success", "save_success"); + }else { + //配置直接生效 + addMessage(redirectAttributes, "success", "audit_success"); + } } catch (Exception e) { e.printStackTrace(); if (e instanceof MaatConvertException) { diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java index 85122e6ee..5b625f353 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java @@ -157,7 +157,13 @@ public class ControlPolicyController extends BaseController{ ,RedirectAttributes redirectAttributes){ try{ controlPolicyService.saveOrUpdate(cfg,areaCfgIds); - addMessage(redirectAttributes,"success","save_success"); + //配置仅保存 + if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) { + addMessage(redirectAttributes, "success", "save_success"); + }else { + //配置直接生效 + addMessage(redirectAttributes, "success", "audit_success"); + } }catch(Exception e){ logger.error("信息保存失败",e); if(e instanceof MaatConvertException) { diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java index 3cbdc2dee..ac2c1f93e 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java @@ -118,7 +118,13 @@ public class FileStrategyController extends CommonController { cfg.setContentLength(file.length());//文件长度 } proxyFileStrategyService.saveOrUpdate(cfg); - addMessage(redirectAttributes,"success","save_success"); + //配置仅保存 + if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) { + addMessage(redirectAttributes, "success", "save_success"); + }else { + //配置直接生效 + addMessage(redirectAttributes, "success", "audit_success"); + } }catch(Exception e){ logger.error("信息保存失败",e); if(e instanceof MaatConvertException) {