(1)修复DDOS LOG排序bug
(2)修复Radius 日志查询searchNasIp,searchFramedIp,searchAccount只能选择一个的bug (3)导入加入条数限制
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user