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

fix(log):日志检索模块，删除历史activesys ，修改logSource数据类型为int。增加NTC_IP_LOG 日志检索测试服务接口。后续删除历史遗留日志检索功能及其相关对象

Browse Source
This commit is contained in:
doufenghu
2018-06-10 16:18:34 +08:00
parent 7991707445
commit ea327b17d7
18 changed files with 314 additions and 5723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/restful/DefaultRestErrorResolver.java
View File

@@ -40,14 +40,7 @@ public class DefaultRestErrorResolver implements RestErrorResolver,InitializingB
RestResult error = new RestResult();
error.setStatus(this.getHttpStatusByEx(ex));// 设置http状态
//获取日志源[只有日志需要返回日志源和ActiveSys]
String logSource = ((RestServiceException) ex).getLogSource();
String activeSys = ((RestServiceException) ex).getActiveSys();
if(logSource != null ){
error.setLogSource(logSource);
}
if(activeSys != null ){
error.setActiveSys(activeSys);
}
int logSource = ((RestServiceException) ex).getLogSource();
//RestServiceException 包含有错误code
if(ex instanceof RestServiceException){
@@ -71,8 +64,9 @@ public class DefaultRestErrorResolver implements RestErrorResolver,InitializingB
if(this.exceptionMappingDefinitions.containsKey(ex.getClass().getName())){
return HttpStatus.valueOf(Integer.parseInt(this.exceptionMappingDefinitions.get(ex.getClass()
.getName())));
} else {
return HttpStatus.INTERNAL_SERVER_ERROR;
}
else return HttpStatus.INTERNAL_SERVER_ERROR;
}