(1)修复DDOS LOG排序bug

(2)修复Radius 日志查询searchNasIp，searchFramedIp，searchAccount只能选择一个的bug
(3)导入加入条数限制

src/main/java/com/nis/domain/log/NtcDdosLog.java

@@ -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;
     

src/main/java/com/nis/util/Constants.java

@@ -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);

src/main/java/com/nis/util/excel/ImportBigExcel.java

@@ -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);

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

@@ -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());

src/main/resources/messages/message_en.properties

@@ -652,7 +652,7 @@ attack_max_pps=Max Attack Pps PKT/S
 attack_max_bps=Max Attack Bps Bit/S
 attack_total_pkt=Total Attack PKT
 attack_total_byte=Total Attack Byte
-is_blcok=Is Block
+is_block=Is Block
 firstPage=First Page
 dk_behavior=Behavior
 app_label=App Tag
@@ -1410,4 +1410,5 @@ Unique_num=Unique
 ip=IP
 country=Country
 desc=Desc
-unique_num=Unique
+unique_num=Unique
+import_limit_is=The maximum import size is

src/main/resources/messages/message_ru.properties

@@ -652,7 +652,7 @@ attack_max_pps=\u041c\u0430\u043a\u0441. \u0410\u0442\u0430\u043a\u0430 Pps \u04
 attack_max_bps=\u041c\u0430\u043a\u0441. \u0410\u0442\u0430\u043a\u0430 Bps \u0431\u0438\u0442/\u0441
 attack_total_pkt=\u041e\u0431\u0449\u0438\u0439 PKT \u0430\u0442\u0430\u043a\u0438
 attack_total_byte=\u041e\u0431\u0449\u0438\u0439 \u0431\u0430\u0439\u0442 \u0430\u0442\u0430\u043a\u0438
-is_blcok=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0438\u043b\u0438 \u043d\u0435\u0442?
+is_block=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0438\u043b\u0438 \u043d\u0435\u0442?
 firstPage=\u041f\u0435\u0440\u0432\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430
 dk_behavior=\u041f\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u0435
 app_label=\u0422\u0435\u0433 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f
@@ -1414,4 +1414,5 @@ Unique_num=Unique
 ip=IP
 country=Country
 desc=Desc
-unique_num=Unique
+unique_num=Unique
+import_limit_is=The maximum import size is

src/main/resources/messages/message_zh_CN.properties

@@ -651,7 +651,7 @@ attack_max_pps=\u653b\u51fb\u6700\u5927\u6d41\u91cf \u5305\u6570/\u79d2
 attack_max_bps=\u653b\u51fb\u6700\u5927\u6d41\u91cf Bit/\u79d2
 attack_total_pkt=\u653b\u51fb\u7d2f\u79ef\u5305\u6570
 attack_total_byte=\u653b\u51fb\u7d2f\u79ef\u5b57\u8282\u6570
-is_blcok=\u653b\u51fb\u6d41\u91cf\u662f\u5426\u88ab\u4e22\u5f03
+is_block=\u653b\u51fb\u6d41\u91cf\u662f\u5426\u88ab\u4e22\u5f03
 firstPage=\u9996\u9875
 dk_behavior=\u884c\u4e3a\u8bc6\u522b
 app_label=\u534f\u8bae\u6807\u7b7e
@@ -1410,4 +1410,5 @@ Unique_num=Unique
 ip=IP
 country=Country
 desc=Desc
-unique_num=Unique
+unique_num=Unique
+import_limit_is=\u5BFC\u5165\u9650\u5236\u6700\u5927\u6761\u6570

src/main/resources/nis.properties

@@ -597,4 +597,6 @@ ntcURLReport=ntcURLReport
 ntcIpRangeReport=ntcIpRangeReport
 trafficWebsiteListNoTime=trafficWebsiteListNoTime
 trafficTopicList=trafficTopicList
-trafficDomainTrans=trafficDomainTrans
+trafficDomainTrans=trafficDomainTrans
+#maximum number to import
+import_limit=10

src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp

@@ -238,7 +238,7 @@ $(document).ready(function(){
 								<th class="sort-column attack_max_bps" column="attack_max_bps" ><spring:message code='attack_max_bps'/></th>
  								<th class="sort-column attack_total_pkt" column="attack_total_pkt" ><spring:message code='attack_total_pkt'/></th> 
  								<th class="sort-column attack_total_byte" column="attack_total_byte" ><spring:message code='attack_total_byte'/></th> 
- 								<th class="sort-column is_blcok" column="is_blcok" ><spring:message code='is_blcok'/></th>
+ 								<th class="sort-column is_block" column="is_block" ><spring:message code='is_block'/></th>
  								<th class="sort-column cap_ip" isVisible="false" column="clj_ip" ><spring:message code="clj_ip"/></th>
  								
  								<th class="sort-column trans_proto" column="protocol_type" ><spring:message code="protocol_type"/></th>