gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、修改用户统计界面，2.修改流量统计加载问题，3、配置异常增加error提示

Browse Source
This commit is contained in:
zhanghongqing
2018-11-08 14:52:58 +08:00
parent b7fc16e681
commit 22d1228097
19 changed files with 172 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
View File

@@ -86,6 +86,29 @@ public class TrafficStatisticsReportController extends BaseController {
List accountList=(List) map.get("accountList");
model.addAttribute("nasIpList", nasIpList);
model.addAttribute("accountList", accountList);
if(StringUtil.isBlank(account)&&accountList!=null&&accountList.size()>0&&!"3".equals(searchBusinessType)) {
Map accountMap = (Map) accountList.get(0);
String firstAccount=(String) accountMap.get("account");
String userString = HttpClientUtil.get(userUrl+"&searchAccount="+firstAccount);
// 指定用户 查询
Gson usergson = new GsonBuilder().create();
userJsonList = usergson.fromJson(userString, new TypeToken<Map>(){}.getType());
userList = (ArrayList) userJsonList.get("data");
model.addAttribute("userList", userList);
model.addAttribute("searchAccount", firstAccount);
}
if(StringUtil.isBlank(nasIp)&&nasIpList!=null&&nasIpList.size()>0&&!"2".equals(searchBusinessType)) {
Map IpMap = (Map) nasIpList.get(0);
String firstIp=(String) IpMap.get("nasIp");
String ipString = HttpClientUtil.get(ipUrl+"&searchNasIp="+firstIp);
// 指定IP查询
Gson ipgson = new GsonBuilder().create();
ipJsonList = ipgson.fromJson(ipString, new TypeToken<Map>(){}.getType());
ipList = (ArrayList) ipJsonList.get("data");
model.addAttribute("ipList", ipList);
model.addAttribute("searchNasIp", firstIp);
}
if("2".endsWith(searchBusinessType)&&!StringUtil.isBlank(account)) {
String userString = HttpClientUtil.get(userUrl+"&searchAccount="+account);