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

Merge branch 'demostration_08' into 'develop'

Browse Source 
异常提示调整

See merge request !17
This commit is contained in:
wangxin
2018-08-14 18:01:51 -04:00
parent 2c1b8d4b59 3f9aa29320
commit 92eae3bf39
6 changed files with 131 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import com.nis.domain.configuration.AvSignSampleCfg;
import com.nis.domain.configuration.AvSignSampleCfgModel;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.ToMaatResult.ResponseData;
import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
@@ -157,7 +158,11 @@ public class AvController extends BaseController {
}catch(Exception e){
logger.error("文件上传失败",e);
e.printStackTrace();
addMessage(redirectAttributes,this.getMsgProp().getProperty("request_service_failed")+e.getMessage());
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,e.getMessage());
}else {
addMessage(redirectAttributes,"save_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+entity.getFunctionId();
@@ -165,7 +170,17 @@ public class AvController extends BaseController {
//保存标志样例配置
@RequestMapping(value = {"/sample/saveAudioSignSample"})
public String saveAudioSignSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,String ids,AvSignSampleCfg entity){
avCfgService.saveOrUpdateAvSignSample(entity);
try{
avCfgService.saveOrUpdateAvSignSample(entity);
}catch(Exception e){
logger.error("saveAudioSignSample failed",e);
e.printStackTrace();
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,e.getMessage());
}else {
addMessage(redirectAttributes,"save_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/sample/audioSignSampleList?functionId="+entity.getFunctionId();
}
//修改文件样例配置状态
@@ -248,10 +263,15 @@ public class AvController extends BaseController {
if(!oldSampleUrl.equals(entity.getSampleUrl())){
FileUtils.deleteFile(oldSampleUrl);
}
} catch (MaatConvertException e) {
}catch(Exception e){
e.printStackTrace();
logger.info("音视频文件样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes,this.getMsgProp().getProperty("request_service_failed")+ e.getMessage());
if(e instanceof MaatConvertException) {
logger.info("音视频文件样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes,e.getMessage());
}else {
logger.error("auditAvFileSample failed",e);
addMessage(redirectAttributes,"audit_failed");
}
}
}
return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+functionId;
@@ -285,10 +305,15 @@ public class AvController extends BaseController {
entity.setAuditTime(new Date());
try {
avCfgService.audioAuditAvSignSample(entity,isAudit);
} catch (MaatConvertException e) {
}catch(Exception e){
e.printStackTrace();
logger.info("音视频标识样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes,this.getMsgProp().getProperty("request_service_failed")+ e.getMessage());
if(e instanceof MaatConvertException) {
logger.info("音视频标识样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes,e.getMessage());
}else {
logger.error("auditAvAudioSignSample failed",e);
addMessage(redirectAttributes,"audit_failed");
}
}
}
return "redirect:" + adminPath +"/ntc/av/sample/audioSignSampleList?functionId="+functionId;
@@ -313,9 +338,15 @@ public class AvController extends BaseController {
if(!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){
try {
avCfgService.auditAvSignSample(avSignSampleCfg);
} catch (MaatConvertException e) {
logger.error("下发失败",e);
addMessage(redirectAttributes,this.getMsgProp().getProperty("request_service_failed")+ e.getMessage());
}catch(Exception e){
e.printStackTrace();
if(e instanceof MaatConvertException) {
logger.error("下发失败",e);
addMessage(redirectAttributes,e.getMessage());
}else {
logger.error("auditAvSignSample failed",e);
addMessage(redirectAttributes,"audit_failed");
}
}
}