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

1.VoIP增加compileId查询2.异常处理3.增加国家化

Browse Source
This commit is contained in:
zhanghongqing
2018-08-22 15:46:27 +08:00
parent 508bb590f1
commit e0e2d342a2
7 changed files with 1061 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java
View File

@@ -172,7 +172,7 @@ public class BasicProtocolController extends BaseController {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}else {
e.printStackTrace();
logger.error("auditAvAudioSignSample failed",e);
logger.error("app策略配置下发失败",e);
addMessage(redirectAttributes,"audit_failed");
}

73
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -94,8 +94,15 @@ public class AvContentController extends BaseController {
avContentCfgService.saveOrUpdateAvVoip(cfg);
addMessage(redirectAttributes,"save_success");
}catch(Exception e){
logger.error("voip IP信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("voip IP信息保存失败",e);
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}else {
e.printStackTrace();
logger.error("voip IP信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+cfg.getFunctionId();
}
@@ -107,8 +114,15 @@ public class AvContentController extends BaseController {
avContentCfgService.saveOrUpdateAvVoipAccount(cfg);
addMessage(redirectAttributes,"save_success");
}catch(Exception e){
logger.error("voip Account信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("voip Account信息保存失败",e);
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}else {
e.printStackTrace();
logger.error("voip Account信息保存失败",e);
addMessage(redirectAttributes,"save_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/voipAccountList?functionId="+cfg.getFunctionId();
}
@@ -155,7 +169,19 @@ public class AvContentController extends BaseController {
public String updateVoipValid(Integer isAudit,String compileIds,Integer isValid,String ids,Integer functionId
,RedirectAttributes redirectAttributes
) {
avContentCfgService.updateAvVoipValid(isAudit,isValid,compileIds,functionId);
try {
avContentCfgService.updateAvVoipValid(isAudit,isValid,compileIds,functionId);
} catch (Exception e) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("voip IP信息审核失败",e);
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}else {
e.printStackTrace();
logger.error("voip IP信息审核失败",e);
addMessage(redirectAttributes,"audit_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+functionId;
}
//修改VOIP account配置状态
@@ -164,7 +190,19 @@ public class AvContentController extends BaseController {
public String updateVoipAccountValid(Integer isAudit,String compileIds,Integer isValid,String ids,Integer functionId
,RedirectAttributes redirectAttributes
) {
avContentCfgService.updateAvVoipAccountValid(isAudit,isValid,compileIds,functionId);
try {
avContentCfgService.updateAvVoipAccountValid(isAudit,isValid,compileIds,functionId);
} catch (Exception e) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("voip Account信息审核失败",e);
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}else {
e.printStackTrace();
logger.error("voip Account信息审核失败",e);
addMessage(redirectAttributes,"audit_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/voipAccountList?functionId="+functionId;
}
//修改VOIP IP配置审核状态
@@ -180,8 +218,16 @@ public class AvContentController extends BaseController {
try {
avContentCfgService.auditAvVoip(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
logger.error("VOIP配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.info("VOIP配置下发失败："+e.getMessage());;
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}else {
e.printStackTrace();
logger.error("VOIP配置下发失败",e);
addMessage(redirectAttributes,"audit_failed");
}
}
}
@@ -201,8 +247,15 @@ public class AvContentController extends BaseController {
try {
avContentCfgService.auditAvVoipAccount(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
logger.error("VOIP Account配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.info("VOIPAccount配置下发失败："+e.getMessage());;
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}else {
e.printStackTrace();
logger.error("VOIPAccount配置下发失败",e);
addMessage(redirectAttributes,"audit_failed");
}
}
}