From e98c8f2f2ad18d1dfbca09c7449cbf9ffadaca8f Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@192.168.11.154>
Date: Wed, 27 Feb 2019 17:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=81=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1app=E8=B6=8B=E5=8A=BF=E4=B8=ADapp=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7=E8=B7=9F=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E6=A0=87=E7=AD=BE=E5=86=99=E6=B3=95=E7=9A=84=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrafficStatisticsInfoController.java         | 16 +++++++++++++++-
 .../views/dashboard/trafficAppTrendList.jsp      | 15 ++++++++-------
 .../views/dashboard/trafficAppTypeList.jsp       |  6 +++---
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
index 4c4ce263a..34e0fd049 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
@@ -464,7 +464,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 * App趋势界面 独立IP访问数量趋势图
 	 */
 	@RequestMapping(value="appTrendList")
-	public String appTrendList(Model model,String beginDate,String endDate,String appName,Integer appType,Integer entranceId){
+	public String appTrendList(Model model,String beginDate,String endDate,Integer appType,Integer entranceId){
 		if(StringUtil.isBlank(beginDate)||StringUtil.isBlank(endDate)){
 			 Calendar cal = Calendar. getInstance ();
 		        cal.setTime(new Date());
@@ -472,6 +472,20 @@ public class TrafficStatisticsInfoController extends BaseController {
 		        cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 2);
 		        beginDate =  new  SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
 		}
+		//标签集合
+		List<CodeResult> codeList = CodeDicUtils.getCodeList("appCode");
+		//将数字替换为标签文字
+		String appName="";
+		if(appType!=null){
+			Double value1 = Double.valueOf(appType);
+			for (CodeResult code : codeList) {
+				Double value2 = Double.valueOf(code.getCode().trim());
+				if(value1.equals(value2)){
+					appName= code.getItem().trim();
+					break;
+				}
+			}
+		}
 		model.addAttribute("appName", appName);
 		model.addAttribute("appType", appType);
 		model.addAttribute("entranceId", entranceId);
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
index e2fd71793..c8502308e 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
@@ -235,6 +235,7 @@
 	<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/no-data-to-display.js"></script>
 	
 	<script type="text/javascript">
+	var appName="<spring:message code='${appName}'/>";
 		$(document).ready(function() {
 			var starth = $("#beginDateh").val();
 			var endh = $("#endDateh").val();
@@ -947,7 +948,7 @@
 									},
 					    		},
 								exporting : {
-									filename : '<spring:message code="${appName}"></spring:message>'+nowDate.getFullYear()+(nowDate.getMonth()+1)+nowDate.getDate()+nowDate.getHours()+nowDate.getMinutes()+nowDate.getSeconds(),
+									filename : appName+nowDate.getFullYear()+(nowDate.getMonth()+1)+nowDate.getDate()+nowDate.getHours()+nowDate.getMinutes()+nowDate.getSeconds(),
 									scale : 1,
 									sourceWidth : 1280,
 									sourceHeight : 500,
@@ -972,7 +973,7 @@
 										var start=(new Date().getTime())-(1000 * 60 * 10+1000 * 60 * 5);
 							        	var begin=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(start)); //获取1个点少算一分钟
 										var end=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(timebe)); 
-							        	var tlt='<spring:message code="${appName}"></spring:message> '+begin+'--'+end+''
+							        	var tlt=appName+begin+'--'+end+''
 										return tlt;
 									}())
 										
@@ -1108,7 +1109,7 @@
 					        	var startTime=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(start));
 					        	var ends=(new Date().getTime())-(1000 * 60 * 5);
 					        	var endTime=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(ends));
-					        	chart.title.update({ text: '<spring:message code="${appName}"></spring:message> '+startTime+'--'+endTime+''});
+					        	chart.title.update({ text: appName+startTime+'--'+endTime+''});
 								closeTip();
 							},
 							error : function(data, textStatus, errorThrown) {
@@ -1201,7 +1202,7 @@
 									},
 					    		},
 								exporting : {
-									filename : '<spring:message code="${appName}"></spring:message>'+nowDate.getFullYear()+(nowDate.getMonth()+1)+nowDate.getDate()+nowDate.getHours()+nowDate.getMinutes()+nowDate.getSeconds(),
+									filename : appName+nowDate.getFullYear()+(nowDate.getMonth()+1)+nowDate.getDate()+nowDate.getHours()+nowDate.getMinutes()+nowDate.getSeconds(),
 									scale : 1,
 									sourceWidth : 1280,
 									sourceHeight : 500,
@@ -1220,7 +1221,7 @@
 // 								colors:['#EF843C','#EFCA6B','#6ED0E0'],
 								colors:['#709c58','#c9a206','#64b5c5'],
 								title : {
-									text : '<spring:message code="${appName}"></spring:message>  '+$("#beginDateh").val()+'--'+$("#endDateh").val()+''
+									text : appName+$("#beginDateh").val()+'--'+$("#endDateh").val()+''
 								},
 								xAxis: {
 									type:'datetime',
@@ -1342,10 +1343,10 @@
 				}
 				 total.unshift('<spring:message code="report_total"/>');
 				 rows.push(total)
-				 map["titleTime"]='<spring:message code="${appName}"></spring:message>'+","+start+"--"+end;
+				 map["titleTime"]=appName+","+start+"--"+end;
 				 map["heard"]=heard;
 				 map["book"]=rows;
-				 map["titleCode"]='<spring:message code="${appName}"></spring:message>'+nowDate.getFullYear()+(nowDate.getMonth()+1)+nowDate.getDate()+nowDate.getHours()+nowDate.getMinutes()+nowDate.getSeconds();
+				 map["titleCode"]=appName+nowDate.getFullYear()+(nowDate.getMonth()+1)+nowDate.getDate()+nowDate.getHours()+nowDate.getMinutes()+nowDate.getSeconds();
 				var exports = JSON.stringify(map);
 				aJaxImportPost("${ctx}/export/ajaxExport",{"exports":exports});
 			};
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
index 450d41135..034e99a08 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
@@ -347,7 +347,7 @@ function htmlData(fileDataS){
         		gbytper=((data.GByte/totalGByte)*100).toFixed(2);
         	}
         	var	html = "<tr>";
-            	html+= "<td class='tc'><a href='#' onclick='openAppTrend(\""+data.appType+"\",\""+data.appName+"\")'><i class='fa fa-line-chart'></i></a></td>";
+            	html+= "<td class='tc'><a href='#' onclick='openAppTrend(\""+data.appType+"\")'><i class='fa fa-line-chart'></i></a></td>";
             	html+= "<td class='tc'>"+data.appName+"</td>";
             	html+= "<td class='tc'>"+data.linkNum+"</td>";
             	html+= "<td class='tc'>"+linkper+"%"+"</td>";
@@ -378,11 +378,11 @@ function htmlData(fileDataS){
     }
 }
 // 跳转到app访问趋势
-function openAppTrend(appType,appName){
+function openAppTrend(appType){
 	var beginDate=$("#beginDateh").val();
 	var endDate=$("#endDateh").val();
 	var entranceId = $("#entranceId").val();
-	var url= "${ctx}/dashboard/traffic/appTrendList?beginDate="+beginDate+"&endDate="+endDate+"&appName="+appName+"&appType="+appType+"&entranceId="+entranceId;
+	var url= "${ctx}/dashboard/traffic/appTrendList?beginDate="+beginDate+"&endDate="+endDate+"&appType="+appType+"&entranceId="+entranceId;
 	window.location.href=(url)
 }
 /**