修改统计报表的数据列，以及导出忽略的列，以及ip range list查询范围

src/main/java/com/nis/web/controller/report/ReportController.java

@@ -176,7 +176,7 @@ public class ReportController extends BaseController {
 				params.put("searchCountry", log.getSearchCountry());
 			}
 			//查询开始IP
-			if (StringUtils.isNotBlank(log.getSearchStartIp())) {
+			if (StringUtils.isNotBlank(log.getSearchIp())) {
 				params.put("searchIp", log.getSearchIp());
 			}
 			//
@@ -429,7 +429,7 @@ public class ReportController extends BaseController {
 							+ "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,";*/
 				hColumns += ",s_asn,d_asn,cfg_id,action,found_time,recv_time,entrance_id,clj_ip,transport_layer_protocol,addr_type,server_ip,"
 						+ "client_ip,server_port,client_port,deviceid,link_id,encap_type,direction,inner_smac,inner_dmac,"
-						+ "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,";
+						+ "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,reportTime,";
 				String cfgIndexInfoNoExport = "," + hColumns;
 				noExportMap.put("Ntc_HTTPS_Report", cfgIndexInfoNoExport);
 				dataMap.put("Ntc_HTTPS_Report", list);

src/main/resources/messages/message_en.properties

@@ -1370,7 +1370,7 @@ keyword_log_tips=Deduplicate http body keywords log,for the control status of ht
 conn_record=Connection Records
 bps=Gbps
 bps_percent=Bps Percent
-pps=pps
+pps=PPS
 pps_percent=pps Percent
 spoofing_ip_object=Spoofing IP Pool
 spoofing_ip_policy=IP Spoofing
@@ -1405,7 +1405,7 @@ max_tcp=Max
 APP_TCP_SESSION_BYTE=Session
 ip_count=Unique IP Count
 counnection_count=Connection Count
-asn=asn
+asn=ASN
 Unique_num=Unique
 ip=IP
 country=Country

src/main/resources/messages/message_ru.properties

@@ -1374,7 +1374,7 @@ keyword_log_tips=\u041a\u043e\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043b\u
 conn_record=Connection Records
 bps=Gbps
 bps_percent=Bps Percent
-pps=pps
+pps=PPS
 pps_percent=pps Percent
 spoofing_ip_object=Spoofing IP Pool
 spoofing_ip_policy=IP Spoofing
@@ -1409,7 +1409,7 @@ max_tcp=Max
 APP_TCP_SESSION_BYTE=Session
 ip_count=Unique IP Count
 counnection_count=Connection Count
-asn=asn
+asn=ASN
 Unique_num=Unique
 ip=IP
 country=Country

src/main/resources/messages/message_zh_CN.properties

@@ -1370,7 +1370,7 @@ keyword_log_tips=\u6e05\u6d17\u540e\u7f51\u9875\u5173\u952e\u5b57\u65e5\u5fd7\uf
 conn_record=\u901a\u8054\u5173\u7cfb
 bps=Gbps
 bps_percent=Bps Percent
-pps=pps
+pps=PPS
 pps_percent=pps Percent
 spoofing_ip_object=Spoofing IP Pool
 spoofing_ip_policy=IP Spoofing
@@ -1405,7 +1405,7 @@ max_tcp=Max
 APP_TCP_SESSION_BYTE=Session
 ip_count=Unique IP Count
 counnection_count=Connection Count
-asn=asn
+asn=ASN
 Unique_num=Unique
 ip=IP
 country=Country

src/main/webapp/WEB-INF/views/report/asnRecordList.jsp

@@ -106,9 +106,9 @@
 								<%-- <th><spring:message code="log"/></th> --%>
 								<%-- <th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th> --%>
-								<th class="sort-column bps" columan="bps"><spring:message code="bps"/></th>
-								<th class="sort-column pps" columan="pps"><spring:message code="pps"/></th>
 								<th class="sort-column s_asn" columan="asn"><spring:message code="asn"/></th>
+								<th class="sort-column pps" columan="pps"><spring:message code="pps"/></th>
+								<th class="sort-column bps" columan="bps"><spring:message code="bps"/></th>
 							</tr>
 						</thead>
 						<tbody>
@@ -117,10 +117,12 @@
 									<%-- <td>
 									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"  ><i class="icon-book-open"></i></a>
-									</td> --%>									
+									</td> --%>		
+									<td>${log.asn}</td>	
+									<td>${log.pps }</td>						
 									<td>${log.bps }</td>
-									<td>${log.pps }</td>
-									<td>${log.asn}</td>
+									
+									
 								</tr>
 							</c:forEach>
 						</tbody>

src/main/webapp/WEB-INF/views/report/urlReportList.jsp

@@ -130,7 +130,7 @@
 								<th class="sort-column url" column="url" style="width: 350px;"><spring:message code="url"/></th>
 								<th class="sort-column ip_addr" column="ipCount"><spring:message code="ip_count"/></th>
 								<th class="sort-column sum" column="connCount"><spring:message code="counnection_count"/></th>
-								<th class="sort-column url_count" column="reportTime"><spring:message code="statistic_time"/></th> 								
+								<%-- <th class="sort-column url_count" column="reportTime"><spring:message code="statistic_time"/></th> 	 --%>							
 							</tr>
 						</thead>
 						<tbody>
@@ -139,7 +139,7 @@
 									 	<td>${log.url }</td>
 										<td>${log.ipCount }</td>
 										<td>${log.connCount }</td>
-										<td >${log.reportTime}</td>
+										<%-- <td >${log.reportTime}</td> --%>
 									</tr>
 								</c:forEach>