gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复审核通过配置修改成功提示信息bug

Browse Source
This commit is contained in:
wangwei
2019-05-27 16:52:19 +08:00
parent 72fee91228
commit ab25fbc8f0
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -345,7 +345,13 @@ public class AvController extends BaseController {
RedirectAttributes redirectAttributes, String ids, AvSignSampleCfg entity) { RedirectAttributes redirectAttributes, String ids, AvSignSampleCfg entity) {
try { try {
avCfgService.saveOrUpdateAvSignSample(entity); 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) { } catch (Exception e) {
logger.error("saveAudioSignSample failed", e); logger.error("saveAudioSignSample failed", e);
e.printStackTrace(); e.printStackTrace();
@@ -597,7 +603,13 @@ public class AvController extends BaseController {
// if(!avSignSampleCfg.getAction().equals(avSignSampleCfg.getActionOld())||!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){ // if(!avSignSampleCfg.getAction().equals(avSignSampleCfg.getActionOld())||!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){
try { try {
avCfgService.auditAvSignSample(avSignSampleCfg); 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) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
if (e instanceof MaatConvertException) { if (e instanceof MaatConvertException) {

8
src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java
View File

@@ -157,7 +157,13 @@ public class ControlPolicyController extends BaseController{
,RedirectAttributes redirectAttributes){ ,RedirectAttributes redirectAttributes){
try{ try{
controlPolicyService.saveOrUpdate(cfg,areaCfgIds); 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){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {

3
src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java
View File

@@ -126,8 +126,7 @@ public class FileStrategyController extends CommonController {
}else { }else {
//配置直接生效 //配置直接生效
addMessage(redirectAttributes, "success", "audit_success"); addMessage(redirectAttributes, "success", "audit_success");
} }
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){ }catch(Exception e){
logger.error("信息保存失败",e); logger.error("信息保存失败",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {