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

(1)修复DDOS LOG排序bug

Browse Source 
(2)修复Radius 日志查询searchNasIp，searchFramedIp，searchAccount只能选择一个的bug
(3)导入加入条数限制
This commit is contained in:
wangxin
2018-12-19 15:24:16 +06:00
parent 3248cde3ba
commit ad8cb6cd94
9 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/log/NtcDdosLog.java
View File

@@ -33,7 +33,7 @@ public class NtcDdosLog extends BaseLogEntity<NtcDdosLog> {
@ExcelField(title="attack_total_byte",sort=14)
@ApiModelProperty(value = "攻击累积字节数", required = true)
protected String attackTotalByte;
@ExcelField(title="is_blcok ",dictType="SYS_YES_NO",sort=15)
@ExcelField(title="is_block ",dictType="SYS_YES_NO",sort=15)
@ApiModelProperty(value = "攻击流量是否被丢弃", required = true)
protected Integer isBlock;

4
src/main/java/com/nis/util/Constants.java
View File

@@ -8,6 +8,10 @@ import java.util.regex.Pattern;
import com.google.gson.GsonBuilder;
public final class Constants {
/**
* 导入条数限制
*/
public static final int IMPORT_LIMIT=Configurations.getIntProperty("import_limit",10000);
public static final String GROUP_REUSE_SOURCES=Configurations.getStringProperty("groupReuseSources","groupReuseSources");
public static Integer APP_SPEC_SERVICE_CODE_MIN_VAL=Configurations.getIntProperty("app_spec_service_code_min_val", 300001);
public static Integer APP_SPEC_SERVICE_CODE_MAX_VAL=Configurations.getIntProperty("app_spec_service_code_max_val", 268435455);

3
src/main/java/com/nis/util/excel/ImportBigExcel.java
View File

@@ -33,6 +33,7 @@ import org.xml.sax.SAXException;
import com.google.common.collect.Lists;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.Reflections;
@@ -411,6 +412,8 @@ public class ImportBigExcel extends XLSXCovertCSVReader{
}
if(dataList.size()==0) {
throw new ServiceException(props.getProperty("noneData", "noneData"));
}else if(dataList.size()>(Constants.IMPORT_LIMIT+1)) {
throw new ServiceException(props.getProperty("import_limit_is", "The maximum import size is")+" "+Constants.IMPORT_LIMIT);
}
// Get excel data
BlockingQueue<E> _dataList =new ArrayBlockingQueue(dataList.size(),true);

6
src/main/java/com/nis/web/controller/log/ntc/NtcCollectRadiusLogController.java
View File

@@ -43,9 +43,11 @@ public class NtcCollectRadiusLogController extends BaseController {
// 请求参数判断
if(StringUtils.isNotBlank(log.getNasIp())) {
params.put("searchNasIp", log.getNasIp());
}else if(StringUtils.isNotBlank(log.getFramedIp())) {
}
if(StringUtils.isNotBlank(log.getFramedIp())) {
params.put("searchFramedIp", log.getFramedIp());
}else if(StringUtils.isNotBlank(log.getAccount())) {
}
if(StringUtils.isNotBlank(log.getAccount())) {
params.put("searchAccount", log.getAccount());
}
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());