1.新 httpclient版本到4.5.6,解决凯歌提出的4.4.1版本存在的连接可能出现失败问题

2.提交图标样式更改
This commit is contained in:
zhanghongqing
2018-09-10 11:39:04 +08:00
parent 7f918963a0
commit c5fb19c695
23 changed files with 1826 additions and 199 deletions

View File

@@ -407,7 +407,7 @@ public class DashboardController extends BaseController{
return resultList;
}
@RequestMapping(value="ipActiveList")
@RequestMapping(value="webTypeList")
public String ipActiveList( HttpServletRequest request, HttpServletResponse response, Model model){
PageLog<TrafficIpActiveStatistic> page = new PageLog<TrafficIpActiveStatistic>(request, response);
List list = new ArrayList();
@@ -421,7 +421,23 @@ public class DashboardController extends BaseController{
}
page.setList(list);
model.addAttribute("page", page);
return "/dashboard/trafficConnList";
return "/dashboard/trafficWebTypeList";
}
@RequestMapping(value="bandwidthList")
public String bandwidthList( HttpServletRequest request, HttpServletResponse response, Model model){
PageLog<TrafficIpActiveStatistic> page = new PageLog<TrafficIpActiveStatistic>(request, response);
List list = new ArrayList();
for (int i = 1; i < 10; i++) {
TrafficIpActiveStatistic ip = new TrafficIpActiveStatistic();
ip.setId(i);
ip.setIpAddr(3+i+".1.1."+i);
ip.setAreaId("11");
ip.setLinkNum(1212);
list.add(ip);
}
page.setList(list);
model.addAttribute("page", page);
return "/dashboard/trafficBandwidthList";
}
@@ -451,7 +467,7 @@ public class DashboardController extends BaseController{
// String json = new Gson().toJson();
model.addAttribute("ipAddr",ipAddr);
model.addAttribute("chartMap",list);
return "/dashboard/trafficIpActiveChart";
return "/dashboard/trafficWebTypeList";
}
public class TrafficIpActiveStatistic{
Integer id=1;