首页 protocol、website和aOS/BS图表 数据源格式化

流量日志下所有页面去掉 entrance 的字典展示

14 files changed, 110 insertions, 41 deletions

diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java
index 6c5987c3..b882dd55 100644
--- a/src/main/java/com/nis/domain/log/BaseLogEntity.java
+++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java
@@ -31,7 +31,7 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	protected String sPort; //客户端ip端口

 	

 	protected Integer service; //配置表的serviceId

-	@ExcelField(title="entrance_id",dictType="ENTRANCE",sort=7)

+	@ExcelField(title="entrance_id",sort=7) //dictType="ENTRANCE"

 	protected Integer entranceId; //出入口编号

 	@ExcelField(title="deviceid",dictType="DEVICE",sort=50)

 	protected Integer deviceId; //串联设备编号

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpRecordList.jsp
index 867048fc..32f49ace 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpRecordList.jsp
@@ -323,13 +323,14 @@
 									<td>${log.foundTime }</td>

 									<td>${log.recvTime}</td>

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td >

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
index 2447ef8f..b7b04a38 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
@@ -433,13 +433,14 @@
 									<td>${log.foundTime }</td>

 									<td>${log.recvTime }</td>

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsRecordList.jsp
index 79849c99..cf0a2ec8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsRecordList.jsp
@@ -364,13 +364,14 @@
 									<td>${log.foundTime }</td>

 									<td>${log.recvTime}</td>

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									<td>${log.dnsId}</td>

 									<td>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpAvRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpAvRecordList.jsp
index c5190358..5a8d80ed 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpAvRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpAvRecordList.jsp
@@ -277,13 +277,14 @@
 									<td>${log.foundTime }</td>

 									<td>${log.recvTime}</td>

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td>${log.url}</td>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpDocRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpDocRecordList.jsp
index 016edc30..c60e83ae 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpDocRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpDocRecordList.jsp
@@ -277,13 +277,14 @@
 									<td>${log.foundTime }</td>

 									<td>${log.recvTime}</td>

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td>${log.url}</td>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpExeRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpExeRecordList.jsp
index 28cbbb46..febe2c8e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpExeRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpExeRecordList.jsp
@@ -277,13 +277,14 @@
 									<td>${log.foundTime }</td>

 									<td>${log.recvTime}</td>

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td>${log.url}</td>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpObjScanResultList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpObjScanResultList.jsp
index 8306eb9f..ae67f6c1 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpObjScanResultList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpObjScanResultList.jsp
@@ -282,13 +282,14 @@
 									<td>${log.foundTime }</td>

 									<td>${log.recvTime}</td>

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td>${log.url}</td>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpPostRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpPostRecordList.jsp
index 7d24afd1..a412af6f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpPostRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpPostRecordList.jsp
@@ -277,13 +277,14 @@
 									<td>${log.foundTime }</td>

 									<td>${log.recvTime}</td>

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td>${log.url}</td>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpRecordList.jsp
index 211ab90e..e7dc6301 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpRecordList.jsp
@@ -370,13 +370,14 @@
 									<td>${log.foundTime }</td>

 									<td>${log.recvTime}</td>

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td >${log.capIp}</td>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp
index 727b73d3..355525f9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp
@@ -298,13 +298,14 @@
 									<td>${log.recvTime }</td>

 									

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td>${log.mailProto }</td>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp
index 33c199c2..67eb1463 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp
@@ -273,13 +273,14 @@
 									<td>${log.foundTime }</td>

 									<td>${log.recvTime }</td>

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp
index b40a60d4..b033d2d3 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslRecordLogList.jsp
@@ -305,13 +305,14 @@
 									<td>${log.recvTime }</td>

 									

 									<td>

-										<c:set var="entrances">${log.entranceId }</c:set>

+										<%-- <c:set var="entrances">${log.entranceId }</c:set>

 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">

 											<c:if test="${dic.itemCode eq log.entranceId}">

 												<c:set var="entrances">${dic.itemValue}</c:set>

 											</c:if>

 										</c:forEach>

-										<spring:message code="${entrances}"/>

+										<spring:message code="${entrances}"/> --%>

+										${log.entranceId }

 									</td>

 									

 									<td>${log.version }</td>

diff --git a/src/main/webapp/static/pages/scripts/echart.js b/src/main/webapp/static/pages/scripts/echart.js
index 767450a0..bffd386e 100644
--- a/src/main/webapp/static/pages/scripts/echart.js
+++ b/src/main/webapp/static/pages/scripts/echart.js
@@ -87,10 +87,20 @@
     	var data=new Array();

     	var drillData=new Array();

     	var unit="bytes";

+    	var  minCount = 0;

+    	for (var int = rs.length-1; int >= 0; int--) {

+    		if(rs[int].count>0){

+    			minCount=rs[int].count;

+    			break;

+    		}

+    	}

     	$(rs).each(function(i, d) {

-    		var inoctetsNum=d.count;

-        	unit=changeUnit(inoctetsNum);

-        	inoctetsNum=changeNum(inoctetsNum);

+//    		var inoctetsNum=d.count;

+//        	unit=changeUnit(inoctetsNum);

+//        	inoctetsNum=changeNum(inoctetsNum);

+        	var mapNum=getUnit(minCount,d.count);

+    		var inoctetsNum=mapNum.sum;

+    		unit=mapNum.unit;

 //    		var pktNum=new Array();

 //    		var byteLen=new Array();

 			//协议图-操作系统

@@ -540,8 +550,15 @@
     	var xData=new Array();

     	var drillData=new Array();

     	var unit="bytes";

+    	var  minCount = 0;

+    	for (var int = rs.length-1; int >= 0; int--) {

+    		if(rs[int].count>0){

+    			minCount=rs[int].count;

+    			break;

+    		}

+    	}

     	$(rs).each(function(i, d) {

-    		var mapNum=getUnit(rs[rs.length-1].count,d.count);

+    		var mapNum=getUnit(minCount,d.count);

   //      	var inoctetsNum=d.count;

   //      	unit=changeUnit(inoctetsNum);

   //      	inoctetsNum=changeNum(inoctetsNum);

@@ -735,10 +752,20 @@ function echart_2(rs){
 	var data=new Array();

 	var drillData=new Array();

 	var unit="bytes";

+	var  minCount = 0;

+	for (var int = rs.length-1; int >= 0; int--) {

+		if(rs[int].count>0){

+			minCount=rs[int].count;

+			break;

+		}

+	}

 	$(rs).each(function(i, d) {

-		var inoctetsNum=d.count;

-    	unit=changeUnit(inoctetsNum);

-    	inoctetsNum=changeNum(inoctetsNum);

+//		var inoctetsNum=d.count;

+//    	unit=changeUnit(inoctetsNum);

+//    	inoctetsNum=changeNum(inoctetsNum);

+    	var mapNum=getUnit(minCount,d.count);

+		var inoctetsNum=mapNum.sum;

+		unit=mapNum.unit;

 //		var pktNum=new Array();

 //		var byteLen=new Array();

 		data.push({

@@ -885,10 +912,20 @@ function echart_5(rs){
 	var data=new Array();

 	var drillData=new Array();

 	var unit="bytes";

+	var  minCount = 0;

+	for (var int = rs.length-1; int >= 0; int--) {

+		if(rs[int].count>0){

+			minCount=rs[int].count;

+			break;

+		}

+	}

 	$(rs).each(function(i, d) {

-		var inoctetsNum=d.count;

-    	unit=changeUnit(inoctetsNum);

-    	inoctetsNum=changeNum(inoctetsNum);

+//		var inoctetsNum=d.count;

+//    	unit=changeUnit(inoctetsNum);

+//    	inoctetsNum=changeNum(inoctetsNum);

+    	var mapNum=getUnit(minCount,d.count);

+		var inoctetsNum=mapNum.sum;

+		unit=mapNum.unit;

 //		var pktNum=new Array();

 //		var byteLen=new Array();

 		//协议图-操作系统

@@ -1042,10 +1079,20 @@ function echart_4(rs){
 	var data=new Array();

 //	var drillData=new Array();

 	var unit="bytes";

+	var  minCount = 0;

+	for (var int = rs.length-1; int >= 0; int--) {

+		if(rs[int].count>0){

+			minCount=rs[int].count;

+			break;

+		}

+	}

 		$(rs).each(function(i, d) {

-			var inoctetsNum=d.count;

-	    	unit=changeUnit(inoctetsNum);

-	    	inoctetsNum=changeNum(inoctetsNum);

+//			var inoctetsNum=d.count;

+//	    	unit=changeUnit(inoctetsNum);

+//	    	inoctetsNum=changeNum(inoctetsNum);

+	    	var mapNum=getUnit(minCount,d.count);

+    		var inoctetsNum=mapNum.sum;

+    		unit=mapNum.unit;

 	//		var pktNum=new Array();

 	//		var byteLen=new Array();

 			data.push({

@@ -1185,10 +1232,20 @@ function echart_6(rs){
 	var data=new Array();

 //	var drillData=new Array();

 	var unit="bytes";

+	var  minCount = 0;

+	for (var int = rs.length-1; int >= 0; int--) {

+		if(rs[int].count>0){

+			minCount=rs[int].count;

+			break;

+		}

+	}

 	$(rs).each(function(i, d) {

-		var inoctetsNum=d.count;

-    	unit=changeUnit(inoctetsNum);

-    	inoctetsNum=changeNum(inoctetsNum);

+//		var inoctetsNum=d.count;

+//    	unit=changeUnit(inoctetsNum);

+//    	inoctetsNum=changeNum(inoctetsNum);

+    	var mapNum=getUnit(minCount,d.count);

+		var inoctetsNum=mapNum.sum;

+		unit=mapNum.unit;

 //		var pktNum=new Array();

 //		var byteLen=new Array();

 		//协议图-操作系统