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