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

1、域名限速分发到阀门并额外添加action和service属性；

Browse Source 
2、修改用户行为日志统计验证
This commit is contained in:
zhangdongxu
2018-11-01 14:25:54 +08:00
parent 5e66868e13
commit 7df9ffa8bb
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java
View File

@@ -430,17 +430,16 @@ public class SingleDimensionReport extends BaseRestController {
* @throws Exception
*/
public void setGroupType(NtcRadiusReport ntcRadiusReport) throws Exception {
String groupType ="";
Long times = DateUtil.convertStringToTimestamp(ntcRadiusReport.getSearchReportEndTime(), DateUtil.YYYY_MM_DD_HH24_MM_SS)-DateUtil.convertStringToTimestamp(ntcRadiusReport.getSearchReportStartTime(), DateUtil.YYYY_MM_DD_HH24_MM_SS);
if (times<=24*60*60L) {
groupType ="hour";
}else{
if (times<=30*24*60*60L) {
String groupType ="hour";
if (!(StringUtil.isEmpty(ntcRadiusReport.getSearchReportStartTime())&&StringUtil.isEmpty(ntcRadiusReport.getSearchReportEndTime()))) {
Long times = DateUtil.convertStringToTimestamp(ntcRadiusReport.getSearchReportEndTime(), DateUtil.YYYY_MM_DD_HH24_MM_SS)-DateUtil.convertStringToTimestamp(ntcRadiusReport.getSearchReportStartTime(), DateUtil.YYYY_MM_DD_HH24_MM_SS);
if (times>0&&times<=30*24*60*60L) {
groupType ="day";
}else {
}else if(times>30*24*60*60L){
groupType ="month";
}
}
ntcRadiusReport.setGroupType(groupType);
}
}

2
src/main/java/com/nis/web/service/BaseLogService.java
View File

@@ -383,7 +383,7 @@ public abstract class BaseLogService {
logger.error(e);
throw new RestServiceException(thread, System.currentTimeMillis() - start, "searchReportEndTime参数错误");
}
if (timeCount!=2) {
if (timeCount==1) {
logger.error(RestBusinessCode.config_integrity_error.getErrorReason()+",searchReportStartTime和searchReportEndTime参数必须同时填写");
thread.setExceptionInfo("searchReportStartTime和searchReportEndTime参数必须同时填写");
throw new RestServiceException(thread,