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

20
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -1279,15 +1279,15 @@ public class AppCfgController extends BaseController {
public String updateAppTopicDomainCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) { public String updateAppTopicDomainCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
try { try {
appCfgService.updateAppTopicDomainCfgValid(isValid,ids,functionId); appCfgService.updateAppTopicDomainCfgValid(isValid,ids,functionId);
addMessage(redirectAttributes,"delete_success"); addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) { } catch (Exception e) {
logger.error("app主题网站删除失败",e); logger.error("app主题网站删除失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes,"request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
e.printStackTrace(); e.printStackTrace();
addMessage(redirectAttributes,"delete_failed"); addMessage(redirectAttributes,"error","delete_failed");
} }
} }
return "redirect:" + adminPath +"/app/topicDomainCfgList?functionId="+functionId; return "redirect:" + adminPath +"/app/topicDomainCfgList?functionId="+functionId;
@@ -1360,7 +1360,7 @@ public class AppCfgController extends BaseController {
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -1510,7 +1510,7 @@ public class AppCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("ip addr export failed",e); logger.error("ip addr export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
@@ -1552,7 +1552,7 @@ public class AppCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("top export failed",e); logger.error("top export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
@@ -1595,7 +1595,7 @@ public class AppCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("appIp export failed",e); logger.error("appIp export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
@@ -1642,7 +1642,7 @@ public class AppCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("http export failed",e); logger.error("http export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
@@ -1688,7 +1688,7 @@ public class AppCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("Domain export failed",e); logger.error("Domain export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
@@ -1734,7 +1734,7 @@ public class AppCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("App ssl export failed",e); logger.error("App ssl export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

2
src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java
View File

@@ -353,7 +353,7 @@ public class AppFeatureCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("Appfeature export failed",e); logger.error("Appfeature export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

4
src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java
View File

@@ -201,7 +201,7 @@ public class BasicProtocolController extends BaseController {
public String updateAppPolicyCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) { public String updateAppPolicyCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
try { try {
appCfgService.updateAppPolicyCfgValid(isValid,ids,functionId); appCfgService.updateAppPolicyCfgValid(isValid,ids,functionId);
addMessage(redirectAttributes,"delete_success"); addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) { } catch (Exception e) {
logger.error("基础协议信息保存失败",e); logger.error("基础协议信息保存失败",e);
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
@@ -279,7 +279,7 @@ public class BasicProtocolController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("ip addr export failed",e); logger.error("ip addr export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

2
src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java
View File

@@ -317,7 +317,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("TunnelBehavior export failed",e); logger.error("TunnelBehavior export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

4
src/main/java/com/nis/web/controller/configuration/GroupAreaController.java
View File

@@ -84,10 +84,10 @@ public class GroupAreaController extends BaseController {
public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) { public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
try { try {
groupAreaService.deldete(ids,isValid); groupAreaService.deldete(ids,isValid);
addMessage(redirectAttributes, "delete_success"); addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) { } catch (Exception e) {
logger.error("删除失败",e); logger.error("删除失败",e);
addMessage(redirectAttributes, "delete_failed"); addMessage(redirectAttributes,"error","delete_failed");
} }
return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList"; return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
} }

16
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -63,22 +63,22 @@ public class RequestInfoController extends BaseController{
// 保存用户信息 // 保存用户信息
logger.info(requestInfo.getId()+"修改成功"); logger.info(requestInfo.getId()+"修改成功");
requestInfoService.saveOrUpdate(requestInfo); requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes, "save_success"); addMessage(redirectAttributes,"success","save_success");
}else{ }else{
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
logger.info(requestInfo.getRequestNumber()+"重复数据"); logger.info(requestInfo.getRequestNumber()+"重复数据");
addMessage(model, "save_failed"); addMessage(model,"error","save_failed");
return form(requestInfo, model); return form(requestInfo, model);
} }
// 保存用户信息 // 保存用户信息
requestInfoService.saveOrUpdate(requestInfo); requestInfoService.saveOrUpdate(requestInfo);
addMessage(redirectAttributes, "save_success"); addMessage(redirectAttributes,"success","save_success");
logger.info(requestInfo.getId()+"保存成功"); logger.info(requestInfo.getId()+"保存成功");
} }
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
e.printStackTrace(); e.printStackTrace();
addMessage(model, "save_failed"); addMessage(model,"error","save_failed");
} }
return "redirect:" + adminPath + "/cfg/request/list?repage"; return "redirect:" + adminPath + "/cfg/request/list?repage";
} }
@@ -105,7 +105,7 @@ public class RequestInfoController extends BaseController{
public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){ public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] exId = ids.split(","); String[] exId = ids.split(",");
requestInfoService.requestExamine(exId); requestInfoService.requestExamine(exId);
addMessage(redirectAttributes, "save_success"); addMessage(redirectAttributes,"success","save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage"; return "redirect:" + adminPath + "/cfg/request/list?repage";
} }
@@ -119,7 +119,7 @@ public class RequestInfoController extends BaseController{
public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){ public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
String[] noId = ids.split(","); String[] noId = ids.split(",");
requestInfoService.requestExamineNo(noId); requestInfoService.requestExamineNo(noId);
addMessage(redirectAttributes, "save_success"); addMessage(redirectAttributes,"success","save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage"; return "redirect:" + adminPath + "/cfg/request/list?repage";
} }
@@ -133,7 +133,7 @@ public class RequestInfoController extends BaseController{
public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){ public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] canclelId = ids.split(","); String[] canclelId = ids.split(",");
requestInfoService.requestCancelExamine(canclelId); requestInfoService.requestCancelExamine(canclelId);
addMessage(redirectAttributes, "save_success"); addMessage(redirectAttributes,"success","save_success");
return "redirect:" + adminPath + "/cfg/request/list?repage"; return "redirect:" + adminPath + "/cfg/request/list?repage";
} }
@@ -147,7 +147,7 @@ public class RequestInfoController extends BaseController{
public String delete(String ids, Model model,RedirectAttributes redirectAttributes){ public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
String[] delId = ids.split(","); String[] delId = ids.split(",");
requestInfoService.delete(delId); requestInfoService.delete(delId);
addMessage(redirectAttributes, "delete_success"); addMessage(redirectAttributes,"success","delete_success");
return "redirect:" + adminPath + "/cfg/request/list?repage"; return "redirect:" + adminPath + "/cfg/request/list?repage";
} }

8
src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
View File

@@ -230,10 +230,10 @@ public class IpMultiplexPoolCfgController extends BaseController {
if(!StringUtil.isEmpty(ids)){ if(!StringUtil.isEmpty(ids)){
ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId); ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId);
} }
addMessage(redirectAttributes,"delete_success"); addMessage(redirectAttributes,"success","delete_success");
}catch(Exception e){ }catch(Exception e){
logger.error(e); logger.error(e);
addMessage(redirectAttributes,"delete_failed"); addMessage(redirectAttributes,"error","delete_failed");
} }
return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId; return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
} }
@@ -298,7 +298,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("snat export failed",e); logger.error("snat export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
@@ -336,7 +336,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("dnat export failed",e); logger.error("dnat export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

2
src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
View File

@@ -141,7 +141,7 @@ public class DdosCfgController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("ddos export failed",e); logger.error("ddos export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

4
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -241,7 +241,7 @@ public class IpMultiplexController extends CommonController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("snat export failed",e); logger.error("snat export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
@@ -287,7 +287,7 @@ public class IpMultiplexController extends CommonController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("dnat export failed",e); logger.error("dnat export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

4
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -616,11 +616,11 @@ public class AvContentController extends BaseController {
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
e.printStackTrace(); e.printStackTrace();
logger.error("Stream Media 信息保存失败",e); logger.error("Stream Media 信息保存失败",e);
addMessage(redirectAttributes,"request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
e.printStackTrace(); e.printStackTrace();
logger.error("Stream Media 信息保存失败",e); logger.error("Stream Media 信息保存失败",e);
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+cfg.getFunctionId(); return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+cfg.getFunctionId();

22
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -85,11 +85,11 @@ public class FileTransferCfgController extends BaseController{
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
e.printStackTrace(); e.printStackTrace();
logger.error("ftp信息保存失败",e); logger.error("ftp信息保存失败",e);
addMessage(redirectAttributes,"request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
e.printStackTrace(); e.printStackTrace();
logger.error("ftp信息保存失败",e); logger.error("ftp信息保存失败",e);
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
} }
} }
return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+entity.getFunctionId(); return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+entity.getFunctionId();
@@ -148,11 +148,11 @@ public class FileTransferCfgController extends BaseController{
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
e.printStackTrace(); e.printStackTrace();
logger.info("ftp配置删除失败："+e.getMessage());; logger.info("ftp配置删除失败："+e.getMessage());;
addMessage(redirectAttributes,"request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
e.printStackTrace(); e.printStackTrace();
logger.error("ftp配置删除失败",e); logger.error("ftp配置删除失败",e);
addMessage(redirectAttributes,"delete_failed"); addMessage(redirectAttributes,"error","delete_failed");
} }
} }
return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+functionId; return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+functionId;
@@ -171,16 +171,16 @@ public class FileTransferCfgController extends BaseController{
entity.setFunctionId(functionId); entity.setFunctionId(functionId);
try { try {
fileTransferCfgService.auditFtpCfg(entity,isAudit); fileTransferCfgService.auditFtpCfg(entity,isAudit);
addMessage(redirectAttributes,"audit_success"); addMessage(redirectAttributes,"success","audit_success");
} catch ( Exception e) { } catch ( Exception e) {
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
e.printStackTrace(); e.printStackTrace();
logger.error("ftp配置下发失败："+e.getMessage());; logger.error("ftp配置下发失败："+e.getMessage());;
addMessage(redirectAttributes,"request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
e.printStackTrace(); e.printStackTrace();
logger.error("ftp配置下发失败",e); logger.error("ftp配置下发失败",e);
addMessage(redirectAttributes,"audit_failed"); addMessage(redirectAttributes,"error","audit_failed");
} }
} }
} }
@@ -256,8 +256,6 @@ public class FileTransferCfgController extends BaseController{
} }
fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds); fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds);
addMessage(redirectAttributes,"success","save_success"); addMessage(redirectAttributes,"success","save_success");
} catch (MaatConvertException e) {
addMessage(redirectAttributes, "request_service_failed");
} catch ( Exception e) { } catch ( Exception e) {
if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) { if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","request_service_failed"); addMessage(redirectAttributes,"error","request_service_failed");
@@ -554,7 +552,7 @@ public class FileTransferCfgController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("ftp export failed",e); logger.error("ftp export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
@@ -642,7 +640,7 @@ public class FileTransferCfgController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("p2p export failed",e); logger.error("p2p export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
@@ -682,7 +680,7 @@ public class FileTransferCfgController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("file export failed",e); logger.error("file export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

2
src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java
View File

@@ -276,7 +276,7 @@ public class MailCfgController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("mail export failed",e); logger.error("mail export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

2
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -403,7 +403,7 @@ public class HttpRedirectPolicyController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("http export failed",e); logger.error("http export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
/*return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();*/ /*return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();*/
} }

8
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -147,7 +147,7 @@ public class InterceptController extends CommonController{
entity.setFunctionId(functionId); entity.setFunctionId(functionId);
try { try {
interceptCfgService.auditInterceptIpCfg(entity,isAudit); interceptCfgService.auditInterceptIpCfg(entity,isAudit);
addMessage(redirectAttributes,"audit_success"); addMessage(redirectAttributes,"success","audit_success");
} catch ( Exception e) { } catch ( Exception e) {
logger.error("intercept ip audit failed",e); logger.error("intercept ip audit failed",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
@@ -164,10 +164,10 @@ public class InterceptController extends CommonController{
public String updateInterceptIpValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { public String updateInterceptIpValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
try { try {
interceptCfgService.updatInterceptValid(isValid,ids,functionId); interceptCfgService.updatInterceptValid(isValid,ids,functionId);
addMessage(redirectAttributes,"delete_success"); addMessage(redirectAttributes,"error","delete_success");
} catch (Exception e) { } catch (Exception e) {
logger.error("intercept ip delete failed",e); logger.error("intercept ip delete failed",e);
addMessage(redirectAttributes,"delete_failed"); addMessage(redirectAttributes,"error","delete_failed");
} }
return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId; return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId;
} }
@@ -311,7 +311,7 @@ public class InterceptController extends CommonController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("ip addr export failed",e); logger.error("ip addr export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes,"error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

24
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
View File

@@ -101,24 +101,28 @@ public class PxyObjKeyringController extends BaseController {
boolean publicKeyFileflag=validCertFileContent(publicKeyFileI,"-incert"); boolean publicKeyFileflag=validCertFileContent(publicKeyFileI,"-incert");
boolean privateKeyFileflag=validCertFileContent(privateKeyFileI,"-inkey"); boolean privateKeyFileflag=validCertFileContent(privateKeyFileI,"-inkey");
if(!publicKeyFileflag && !privateKeyFileflag){ if(!publicKeyFileflag && !privateKeyFileflag){
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
logger.error(publicKeyFileI.getOriginalFilename()+" and "+privateKeyFileI.getOriginalFilename()+" file non certificate file format "); logger.error(publicKeyFileI.getOriginalFilename()+" and "+privateKeyFileI.getOriginalFilename()+" file non certificate file format ");
throw new MultiPartNewException( throw new MultiPartNewException(
this.getMsgProp().getProperty("certificate_error") this.getMsgProp().getProperty("certificate_error")
); );
}else if(!publicKeyFileflag){ }else if(!publicKeyFileflag){
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
logger.error(publicKeyFileI.getOriginalFilename()+" file non public key file format "); logger.error(publicKeyFileI.getOriginalFilename()+" file non public key file format ");
throw new MultiPartNewException(this.getMsgProp().getProperty("public_file_error")); throw new MultiPartNewException(this.getMsgProp().getProperty("public_file_error"));
}else if(!privateKeyFileflag){ }else if(!privateKeyFileflag){
addMessage(redirectAttributes,"save_failed"); addMessage(redirectAttributes,"error","save_failed");
logger.error(privateKeyFileI.getOriginalFilename()+" file non private key file format "); logger.error(privateKeyFileI.getOriginalFilename()+" file non private key file format ");
throw new MultiPartNewException(this.getMsgProp().getProperty("private_file_error")); throw new MultiPartNewException(this.getMsgProp().getProperty("private_file_error"));
} }
} catch (Exception e) { } catch (Exception e) {
validFlag=false; validFlag=false;
logger.error("证书文件校验失败",e); logger.error("证书文件校验失败",e);
addMessage(redirectAttributes,"error",e.getMessage()); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
} }
try{ try{
@@ -160,7 +164,11 @@ public class PxyObjKeyringController extends BaseController {
} }
}catch (Exception e) { }catch (Exception e) {
logger.error("证书信息获取失败",e); logger.error("证书信息获取失败",e);
addMessage(redirectAttributes,"error","save_failed"); if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"error","save_failed");
}
} }
try{ try{
if(validFlag){ if(validFlag){
@@ -217,9 +225,9 @@ public class PxyObjKeyringController extends BaseController {
}catch(Exception e){ }catch(Exception e){
logger.error("证书上传失败",e); logger.error("证书上传失败",e);
if(e instanceof MaatConvertException) { if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error",e.getMessage()); addMessage(redirectAttributes,"error","request_service_failed");
}else { }else {
addMessage(redirectAttributes,"error",e.getMessage()); addMessage(redirectAttributes,"error","save_failed");
} }
} }
@@ -383,7 +391,7 @@ public class PxyObjKeyringController extends BaseController {
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap); this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("pxyObjKeyring export failed",e); logger.error("pxyObjKeyring export failed",e);
addMessage(redirectAttributes, "export_failed"); addMessage(redirectAttributes, "error","export_failed");
} }
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }

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"); List accountList=(List) map.get("accountList");
model.addAttribute("nasIpList", nasIpList); model.addAttribute("nasIpList", nasIpList);
model.addAttribute("accountList", accountList); 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)) { if("2".endsWith(searchBusinessType)&&!StringUtil.isBlank(account)) {
String userString = HttpClientUtil.get(userUrl+"&searchAccount="+account); String userString = HttpClientUtil.get(userUrl+"&searchAccount="+account);

91
src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
View File

@@ -421,7 +421,7 @@ function ajaxinfo(){
url:'${ctx}/dashboard/traffic/info', url:'${ctx}/dashboard/traffic/info',
type : "get" , type : "get" ,
dataType:'json', dataType:'json',
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (data){ success:function (data){
var loopConnNum =loopConnNum= data.loopConnNum; var loopConnNum =loopConnNum= data.loopConnNum;
var rejectNum =data.rejectNum; var rejectNum =data.rejectNum;
@@ -547,16 +547,19 @@ function protocolList(){
url: '${ctx}/dashboard/protocol', url: '${ctx}/dashboard/protocol',
type : "get" , type : "get" ,
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) { success:function (rs) {
if(rs!=null&&rs.length>0&&rs[0].error!=null){ if(rs!=null&&rs.length>0&&rs[0].error!=null){
top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
return; return;
}else{ }else{
echart_1(rs); echart_1(rs);
closeTip();
} }
}, closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }
@@ -567,16 +570,19 @@ function ipActiveList(){
url: '${ctx}/dashboard/ipActive', url: '${ctx}/dashboard/ipActive',
type : "get" , type : "get" ,
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) { success:function (rs) {
if(rs!=null&&rs.length>0&&rs[0].error!=null){ if(rs!=null&&rs.length>0&&rs[0].error!=null){
top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
return; return;
}else{ }else{
echart_main(rs); echart_main(rs);
closeTip();
} }
}, closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }
@@ -587,7 +593,7 @@ function portActiveList(){
url: '${ctx}/dashboard/portActive', url: '${ctx}/dashboard/portActive',
type : "get" , type : "get" ,
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
beforeSend: function () { beforeSend: function () {
var msg = "Reloading..."; var msg = "Reloading...";
@@ -632,7 +638,10 @@ function portActiveList(){
} }
} }
closeTip(); closeTip();
}, },
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }
@@ -643,16 +652,19 @@ function appTypeList(){
url: '${ctx}/dashboard/app', url: '${ctx}/dashboard/app',
type : "get" , type : "get" ,
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) { success:function (rs) {
if(rs!=null&&rs.length>0&&rs[0].error!=null){ if(rs!=null&&rs.length>0&&rs[0].error!=null){
top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
return; return;
}else{ }else{
echart_3(rs); echart_3(rs);
closeTip();
} }
}, closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }
@@ -663,7 +675,7 @@ function systemList(){
url: '${ctx}/dashboard/osList', url: '${ctx}/dashboard/osList',
type : "get" , type : "get" ,
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
beforeSend: function () { beforeSend: function () {
var msg = "Reloading..."; var msg = "Reloading...";
@@ -709,9 +721,12 @@ function systemList(){
} }
//终端图-操作系统 //终端图-操作系统
echart_2(rs.reverse()); echart_2(rs.reverse());
closeTip();
} }
}, closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }
// 点击操作系统列表右侧显示 浏览器图 // 点击操作系统列表右侧显示 浏览器图
@@ -726,11 +741,14 @@ function osClick(osType,obj){
type : "get" , type : "get" ,
data:{"osType":osType}, data:{"osType":osType},
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) { success:function (rs) {
echart_5(rs.reverse()); echart_5(rs.reverse());
closeTip(); closeTip();
}, },
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }
//点击浏览器列表右侧显示 操作系统图 //点击浏览器列表右侧显示 操作系统图
@@ -743,11 +761,14 @@ function bsClick(bsType,obj){
type : "get" , type : "get" ,
data:{"bsType":bsType}, data:{"bsType":bsType},
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) { success:function (rs) {
echart_2(rs.reverse()); echart_2(rs.reverse());
closeTip(); closeTip();
}, },
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }
@@ -759,7 +780,7 @@ function browserList() {
url: '${ctx}/dashboard/bsList', url: '${ctx}/dashboard/bsList',
type : "get" , type : "get" ,
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
beforeSend: function () { beforeSend: function () {
var msg = "Reloading..."; var msg = "Reloading...";
@@ -805,9 +826,12 @@ function browserList() {
} }
//终端图-浏览器 //终端图-浏览器
echart_5(rs.reverse()); echart_5(rs.reverse());
closeTip();
} }
}, closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }
@@ -818,7 +842,7 @@ function websiteList() {
url: '${ctx}/dashboard/websiteList', url: '${ctx}/dashboard/websiteList',
type : "get" , type : "get" ,
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
beforeSend: function () { beforeSend: function () {
var msg = "ReLoading..."; var msg = "ReLoading...";
var trLen = $("#tbodyData2 tr").length; var trLen = $("#tbodyData2 tr").length;
@@ -861,9 +885,12 @@ function websiteList() {
} }
//网站统计图 //网站统计图
echart_4(rs.reverse()); echart_4(rs.reverse());
closeTip();
} }
}, closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }
//点击http网站列表-显示域名图 //点击http网站列表-显示域名图
@@ -878,11 +905,14 @@ function webClick(websiteServiceId,obj){
type : "get" , type : "get" ,
data:{"websiteServiceId":websiteServiceId}, data:{"websiteServiceId":websiteServiceId},
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) { success:function (rs) {
echart_6(rs); echart_6(rs);
closeTip(); closeTip();
}, },
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }
//网站主题 //网站主题
@@ -892,12 +922,15 @@ function topicAndDomainList(){
url: '${ctx}/dashboard/topicAndDomainList', url: '${ctx}/dashboard/topicAndDomainList',
type : "get" , type : "get" ,
dataType:"json", dataType:"json",
cache:false,async:true, cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) { success:function (rs) {
//主题域名流量统计图 //主题域名流量统计图
echart_topic_domain(rs); echart_topic_domain(rs);
closeTip(); closeTip();
}, },
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
}); });
} }

40
src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
View File

@@ -127,10 +127,10 @@
</head> </head>
<body> <body>
<div class="page-content"> <div class="page-content">
<div class="theme-panel hidden-xs hidden-sm"> <%-- <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/traffic/userBehavior'"><spring:message code="refresh"/></button> <button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/traffic/userBehavior'"><spring:message code="refresh"/></button>
<button type="button" class="btn btn-default" onClick="javascript:window.history.go(-1)"><spring:message code="back"/></button> <button type="button" class="btn btn-default" onClick="javascript:window.history.go(-1)"><spring:message code="back"/></button>
</div> </div> --%>
<h3 class="page-title"> <h3 class="page-title">
<spring:message code="traffic_user_behavior"></spring:message> <spring:message code="traffic_user_behavior"></spring:message>
</h3> </h3>
@@ -249,11 +249,10 @@
<div class="httpReqCfg"> <div class="httpReqCfg">
<div class="row"> <div class="row">
<div class="col-md-4" style="padding-right: 1px;"> <div class="col-md-1">
<div class="panel panel-default" style="height: 500px;"> <div class=" " style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;"> <div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;">
<h5 class="ng-binding"><spring:message code="user_behavior_data"/></h5> <%-- <h5 class="ng-binding"><spring:message code="user_behavior_data"/></h5> --%>
<div id="deviceRank" class="drank hm-scroll">
<!-- <div class="table-responsive"> --> <!-- <div class="table-responsive"> -->
<%-- <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap"> <%-- <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
@@ -280,14 +279,12 @@
<thead> <thead>
<tr> <tr>
<th><spring:message code="account"/></th> <th><spring:message code="account"/></th>
<th><spring:message code="link_num"/></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<c:forEach items="${accountList}" var="data"> <c:forEach items="${accountList}" var="data">
<tr> <tr>
<td>${data.account}</td> <td title="${data.account}">${data.account}</td>
<td><fmt:formatNumber type="number" value="${data.num}" minFractionDigits="0"></fmt:formatNumber></td>
</tr> </tr>
</c:forEach> </c:forEach>
@@ -297,13 +294,12 @@
<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div> <div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
</c:if> </c:if>
<!-- </div> --> <!-- </div> -->
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-8" style="padding-left: 8px;"> <div class="col-md-11" >
<div class="panel panel-default"> <div class=" ">
<div class="panel-body" style="height:500px"> <div class="panel-body" style="height:500px">
<h5 class="ng-binding"><spring:message code="account"/> : ${searchAccount}</h5> <h5 class="ng-binding"><spring:message code="account"/> : ${searchAccount}</h5>
<div id="trend" style="height: 400px; position: relative;" > <div id="trend" style="height: 400px; position: relative;" >
@@ -329,7 +325,7 @@
<span class="year" title="<spring:message code="link_num"/>: <fmt:formatNumber type='number' value='${us.num}' minFractionDigits='0'/>">${us.reportTime}</span> <span class="year" title="<spring:message code="link_num"/>: <fmt:formatNumber type='number' value='${us.num}' minFractionDigits='0'/>">${us.reportTime}</span>
</div> </div>
</div> </div>
<div class="process-noyear"> <div class="process-noyear" title="${us.nasIp}">
${us.nasIp} ${us.nasIp}
</div> </div>
</div> </div>
@@ -354,10 +350,10 @@
<!-- IP --> <!-- IP -->
<div class="httpResCfg"> <div class="httpResCfg">
<div class="row"> <div class="row">
<div class="col-md-4" style="padding-right: 1px; "> <div class="col-md-1">
<div class="panel panel-default" style="height: 500px;"> <div class=" " style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;"> <div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:auto;">
<h5 class="ng-binding"><spring:message code="ip_behavior_data"/></h5> <%-- <h5 class="ng-binding"><spring:message code="ip_behavior_data"/></h5> --%>
<div id="deviceRank" class="drank hm-scroll"> <div id="deviceRank" class="drank hm-scroll">
<!-- <div class="table-responsive"> --> <!-- <div class="table-responsive"> -->
@@ -385,15 +381,13 @@
<thead> <thead>
<tr> <tr>
<th><spring:message code="ip"/></th> <th><spring:message code="ip"/></th>
<th><spring:message code="link_num"/></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<c:forEach items="${nasIpList}" var="data"> <c:forEach items="${nasIpList}" var="data">
<tr> <tr>
<td>${data.nasIp}</td> <td title="${data.nasIp}">${data.nasIp}</td>
<td><fmt:formatNumber type="number" value="${data.num}" minFractionDigits="0"></fmt:formatNumber></td>
</tr> </tr>
</c:forEach> </c:forEach>
@@ -408,8 +402,8 @@
</div> </div>
</div> </div>
<div class="col-md-8" style="padding-left: 8px;"> <div class="col-md-11" >
<div class="panel panel-default"> <div class=" ">
<div class="panel-body" style="height: 500px"> <div class="panel-body" style="height: 500px">
<h5 class="ng-binding"><spring:message code="ip"/> : ${searchNasIp}</h5> <h5 class="ng-binding"><spring:message code="ip"/> : ${searchNasIp}</h5>
<div id="trend" style="height: 400px; position: relative;" > <div id="trend" style="height: 400px; position: relative;" >
@@ -437,7 +431,7 @@
</div> </div>
</div> </div>
<div class="process-noyear"> <div class="process-noyear" title="${it.account}">
${it.account} ${it.account}
</div> </div>
</div> </div>

10
src/main/webapp/static/global/css/layout.css
View File

@@ -31,15 +31,15 @@ a:hover,a:focus{outline:none;text-decoration: none;}
/** /**
* 发展历程 * 发展历程
*/ */
.process-timeline{ height: 387px; width: 98%; position: relative; overflow:hidden;margin-right: 10px} .process-timeline{ height: 387px; width: 98%; position: relative; overflow:hidden;margin-right: 25px}
.process-timeline:after{content:"";position:absolute;top:48%;left:0;margin-left:0;background:url('../img/development_timeline.png') repeat-x; height:15px; width:98%; display:block} .process-timeline:after{content:"";position:absolute;top:48%;left:0;margin-left:0; overflow:hidden;background:url('../img/development_timeline.png') repeat-x; height:15px; width:98%; display:block}
.process-timeline .process-body{ position: relative; height: 100%; margin-left: 0;} .process-timeline .process-body{ position: relative; height: 100%; margin-left: 0; overflow:hidden;}
.process-timeline .process-row{ cursor:move; display: inline-block; width: 150px; float: left; margin-top: 30px; position: relative; height: 300px;overflow:hidden;} .process-timeline .process-row{ cursor:move; display: inline-block; width: 150px; float: left; margin-top: 30px; position: relative; height: 300px;overflow:hidden;}
.process-timeline .process-row .process-time{ position: absolute; top: 48.7%; left: 10%; -wekit-top:48.8%;} .process-timeline .process-row .process-time{ position: absolute; top: 48.7%; left: 10%; -wekit-top:48.8%;}
.process-timeline .process-row .process-time .time-con{ position: relative; text-align: center; } .process-timeline .process-row .process-time .time-con{ position: relative; text-align: center; }
.process-timeline .process-row .process-time .time-con .pic{position: absolute; } .process-timeline .process-row .process-time .time-con .pic{position: absolute; }
.process-timeline .process-row .process-time .time-con .pic i{ font-size: 100px; color: #666; } .process-timeline .process-row .process-time .time-con .pic i{ font-size: 100px; color: #666; }
.process-timeline .process-row .process-time .time-con .year{ position: absolute; font-size: 9px; color:#000; padding: 20px 5px 0 5px;margin-left: 5px;} .process-timeline .process-row .process-time .time-con .year{ position: absolute; font-size: 9px; color:#000; padding: 20px 5px 0 5px;margin-left: 5px; overflow:hidden;}
.process-timeline .process-row .process-time .time-con .bgcolor{ position: absolute; border-radius: 100%; margin-top: 48px; margin-left: 10px; width: 40px; height: 40px; } .process-timeline .process-row .process-time .time-con .bgcolor{ position: absolute; border-radius: 100%; margin-top: 48px; margin-left: 10px; width: 40px; height: 40px; }
.process-timeline .process-row .process-time .time-con .bgcolor.red{ background: red;} .process-timeline .process-row .process-time .time-con .bgcolor.red{ background: red;}
@@ -51,7 +51,7 @@ a:hover,a:focus{outline:none;text-decoration: none;}
.process-timeline .process-row .process-time .time-con .orange i{ color: #ff9900;} .process-timeline .process-row .process-time .time-con .orange i{ color: #ff9900;}
.process-timeline .process-row .process-noyear { position: absolute; top: 43%; width: 200px; font-size: 16px;margin-left: 20px} .process-timeline .process-row .process-noyear { position: absolute; top: 43%; width: 200px; font-size: 16px;margin-left: 20px; overflow:hidden;margin-right:20px}
.process-timeline .process-row .process-content{padding-bottom: 40px; } .process-timeline .process-row .process-content{padding-bottom: 40px; }
.process-timeline .process-row .process-content h2{ font-size: 16px; text-align: center;} .process-timeline .process-row .process-content h2{ font-size: 16px; text-align: center;}
.process-timeline .process-row .process-content p{text-indent: 0 !important; font-size: 11px !important; height: 180px;color: #888; white-space:normal; } .process-timeline .process-row .process-content p{text-indent: 0 !important; font-size: 11px !important; height: 180px;color: #888; white-space:normal; }