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

去掉通联关系日志界面运营商展示，去掉流量统计app详情趋势运营商展示，同时修改导出去掉运营商列，app跳转到app详情界面时携带地域条件

Browse Source 
(cherry picked from commit d0b4907271)
This commit is contained in:
zhanghongqing
2019-01-21 08:54:09 +00:00
committed by 王鑫
parent f8a90c0c8f
commit cca47e3823
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/log/NtcConnRecordLog.java
View File

@@ -31,8 +31,6 @@ public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
protected String ispCode;//运营商
protected String ispNum;//运营商 （entrance_id+device_id）
@Expose
@ExcelField(title="client_port",sort=43)
protected String ispName;//运营商

3
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
View File

@@ -457,7 +457,7 @@ public class TrafficStatisticsInfoController extends BaseController {
* App趋势界面 独立IP访问数量趋势图
*/
@RequestMapping(value="appTrendList")
public String appTrendList(Model model,String beginDate,String endDate,String appName,Integer appType){
public String appTrendList(Model model,String beginDate,String endDate,String appName,Integer appType,Integer entranceId){
if(StringUtil.isBlank(beginDate)||StringUtil.isBlank(endDate)){
Calendar cal = Calendar. getInstance ();
cal.setTime(new Date());
@@ -467,6 +467,7 @@ public class TrafficStatisticsInfoController extends BaseController {
}
model.addAttribute("appName", appName);
model.addAttribute("appType", appType);
model.addAttribute("entranceId", entranceId);
model.addAttribute("beginDate", beginDate);
model.addAttribute("endDate", endDate);
return "/dashboard/trafficAppTrendList";

4
src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java
View File

@@ -121,7 +121,7 @@ public class NtcConnRecordLogController extends BaseController {
if (fromJson.getStatus().intValue() == 200) {
Page<NtcConnRecordLog> data = fromJson.getData();
List<SysIspInfo> ispList = CodeDicUtils.getIspListByIspNum();
if(data.getList()!=null&&data.getList().size()>0){
/*if(data.getList()!=null&&data.getList().size()>0){
for (NtcConnRecordLog cnn : data.getList()) {
String isNum=cnn.getEntranceId()+""+cnn.getDeviceId();
for (SysIspInfo sysIspInfo : ispList) {
@@ -132,7 +132,7 @@ public class NtcConnRecordLogController extends BaseController {
}
}
}
}*/
page.setCount(data.getCount());
page.setLast(data.getLast());
page.setList(data.getList());