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

流量统计-统计页面错误提示信息修改

Browse Source
This commit is contained in:
shangguanyanfei
2019-06-27 10:33:17 +08:00
parent fe24ba0fc6
commit 6e646d83e5
10 changed files with 142 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/util/httpclient/HttpClientUtil.java
View File

@@ -86,7 +86,10 @@ public class HttpClientUtil {
throw new ConnectException("流量统计服务接口连接错误"+response); throw new ConnectException("流量统计服务接口连接错误"+response);
} }
} catch (Exception e) { } catch (Exception e) {
throw e; // e.printStackTrace();
logger.error("获取消息失败，相应内容如下： " + response);
logger.error("获取消息失败 ", e);
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:");
}finally { }finally {
if (response != null) { if (response != null) {
try { try {

157
src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
View File

@@ -36,6 +36,7 @@ import com.nis.domain.SysUser;
import com.nis.domain.configuration.WebsiteDomainTopic; import com.nis.domain.configuration.WebsiteDomainTopic;
import com.nis.domain.dashboard.ConfigStatistic; import com.nis.domain.dashboard.ConfigStatistic;
import com.nis.domain.maat.LogRecvData; import com.nis.domain.maat.LogRecvData;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.CodeDicUtils; import com.nis.util.CodeDicUtils;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.DateUtils; import com.nis.util.DateUtils;
@@ -130,10 +131,17 @@ public class ConfigStatisticsController extends BaseController {
Map result = (Map)fromJsonList.get("data"); Map result = (Map)fromJsonList.get("data");
model.addAttribute("searchDirection", searchDirection); model.addAttribute("searchDirection", searchDirection);
return result; return result;
} catch (Exception e) { } catch (MaatConvertException e1) {
e.printStackTrace(); // e1.printStackTrace();
Properties msgProp = getMsgProp();
logger.error("带宽详情数据获取错误"+e1);
map.put("error",msgProp.getProperty("request_service_failed"));
LogUtils.saveLog(request, null, e1, null);
}catch (Exception e) {
// e.printStackTrace();
Properties msgProp = getMsgProp();
logger.error("带宽详情数据获取错误"+e); logger.error("带宽详情数据获取错误"+e);
map.put("error","request_service_failed"); map.put("error",msgProp.getProperty("search_error"));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return map; return map;
@@ -433,9 +441,15 @@ public class ConfigStatisticsController extends BaseController {
JSONObject obj=JSONObject.fromObject(json); JSONObject obj=JSONObject.fromObject(json);
resultList =getList(fromJsonList); resultList =getList(fromJsonList);
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("配置统计详情数据获取错误"+e1);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
resultList.add(Maps.newHashMap("error","request_service_failed")); logger.error("配置统计详情数据获取错误"+e);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return resultList; return resultList;
@@ -521,10 +535,15 @@ public class ConfigStatisticsController extends BaseController {
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType()); fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
// logger.debug(searchAction+"动作数据"+fromJsonList); // logger.debug(searchAction+"动作数据"+fromJsonList);
resultList = (ArrayList) fromJsonList.get("data"); resultList = (ArrayList) fromJsonList.get("data");
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error(searchAction+"动作详情数据获取错误"+e1);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
logger.error(searchAction+"动作详情数据获取错误"+e); logger.error(searchAction+"动作详情数据获取错误"+e);
resultList.add(Maps.newHashMap("error","request_service_failed")); resultList.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return resultList; return resultList;
@@ -666,10 +685,15 @@ public class ConfigStatisticsController extends BaseController {
m.put("totalGByte", totalGByte); m.put("totalGByte", totalGByte);
} }
} }
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("协议数据获取错误"+e1);
list.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
logger.error("协议数据获取错误"+e); logger.error("协议数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed")); list.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return list; return list;
@@ -753,9 +777,15 @@ public class ConfigStatisticsController extends BaseController {
resultLists.add(maps); resultLists.add(maps);
resultList=resultLists; resultList=resultLists;
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("协议详情数据获取错误"+e1);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
resultList.add(Maps.newHashMap("error","request_service_failed")); logger.error("协议详情数据获取错误"+e);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return resultList; return resultList;
@@ -852,10 +882,15 @@ public class ConfigStatisticsController extends BaseController {
} }
} }
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("app 数据获取错误"+e1);
list.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
logger.error("app 数据获取错误"+e); logger.error("app 数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed")); list.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return list; return list;
@@ -938,9 +973,15 @@ public class ConfigStatisticsController extends BaseController {
maps.put("result", list); maps.put("result", list);
resultLists.add(maps); resultLists.add(maps);
resultList=resultLists; resultList=resultLists;
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("app 详情数据获取错误"+e1);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
resultList.add(Maps.newHashMap("error","request_service_failed")); logger.error("app 详情数据获取错误"+e);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return resultList; return resultList;
@@ -1033,10 +1074,15 @@ public class ConfigStatisticsController extends BaseController {
m.put("totalGByte", totalGByte); m.put("totalGByte", totalGByte);
} }
} }
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("域名数据获取错误"+e1);
list.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
logger.error("域名数据获取错误"+e); logger.error("域名数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed")); list.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return list; return list;
@@ -1122,11 +1168,17 @@ public class ConfigStatisticsController extends BaseController {
resultLists.add(maps); resultLists.add(maps);
resultList=resultLists; resultList=resultLists;
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("域名详情数据获取错误"+e1);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
resultList.add(Maps.newHashMap("error","request_service_failed")); logger.error("域名详情数据获取错误"+e);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return resultList; return resultList;
} }
/** /**
@@ -1201,12 +1253,17 @@ public class ConfigStatisticsController extends BaseController {
} }
} }
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("ClientIP据获取错误"+e1);
list.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
logger.error("ClientIP据获取错误"+e); logger.error("ClientIP据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed")); list.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return list; return list;
} }
@@ -1282,9 +1339,15 @@ public class ConfigStatisticsController extends BaseController {
maps.put("result", list); maps.put("result", list);
resultLists.add(maps); resultLists.add(maps);
resultList=resultLists; resultList=resultLists;
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("ClientIP详情据获取错误"+e1);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
resultList.add(Maps.newHashMap("error","request_service_failed")); logger.error("ClientIP详情据获取错误"+e);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return resultList; return resultList;
@@ -1360,10 +1423,15 @@ public class ConfigStatisticsController extends BaseController {
} }
} }
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("ServerIP数据获取错误"+e1);
list.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
logger.error("ServerIP数据获取错误"+e); logger.error("ServerIP数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed")); list.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return list; return list;
@@ -1442,11 +1510,17 @@ public class ConfigStatisticsController extends BaseController {
resultLists.add(maps); resultLists.add(maps);
resultList=resultLists; resultList=resultLists;
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("ServerIP详情数据获取错误"+e1);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
resultList.add(Maps.newHashMap("error","request_service_failed")); logger.error("ServerIP详情数据获取错误"+e);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return resultList; return resultList;
} }
@@ -1553,12 +1627,17 @@ public class ConfigStatisticsController extends BaseController {
list.add(m); list.add(m);
list.add(m1);*/ list.add(m1);*/
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("SubscriberID数据获取错误"+e1);
list.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
logger.error("SubscriberID数据获取错误"+e); logger.error("SubscriberID数据获取错误"+e);
list.add(Maps.newHashMap("error","request_service_failed")); list.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return list; return list;
} }
@@ -1657,11 +1736,17 @@ public class ConfigStatisticsController extends BaseController {
fromJsonList.put("list", s); fromJsonList.put("list", s);
resultList =getList(fromJsonList);*/ resultList =getList(fromJsonList);*/
} catch (MaatConvertException e1) {
Properties msgProp = getMsgProp();
logger.error("SubscriberID详情数据获取错误"+e1);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("request_service_failed")));
LogUtils.saveLog(request, null, e1, null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Properties msgProp = getMsgProp();
resultList.add(Maps.newHashMap("error","request_service_failed")); logger.error("SubscriberID详情数据获取错误"+e);
resultList.add(Maps.newHashMap("error",msgProp.getProperty("search_error")));
LogUtils.saveLog(request, null, e, null); LogUtils.saveLog(request, null, e, null);
} }
return resultList; return resultList;
} }
} }

2
src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
View File

@@ -205,6 +205,8 @@ function showActionTransChart(chartType,xData,series){
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'/>");
$("#messageBox").html(rs[0].error);
$("#messageBox").append("<button data-dismiss='alert' class='close'>×</button>");
$("#errorTipDiv").show(); $("#errorTipDiv").show();
return; return;
} }

2
src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPList.jsp
View File

@@ -102,6 +102,8 @@ function ajaxClientIPList(start,end,entranceId){
success:function (data){ success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){ if(data!=null&&data.length>0&&data[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'/>");
$("#messageBox").html(data[0].error);
$("#messageBox").append("<button data-dismiss='alert' class='close'>×</button>");
$("#errorTipDiv").show(); $("#errorTipDiv").show();
return; return;
} }

2
src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPList.jsp
View File

@@ -102,6 +102,8 @@ function ajaxServerIPList(start,end,entranceId){
success:function (data){ success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){ if(data!=null&&data.length>0&&data[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'/>");
$("#messageBox").html(data[0].error);
$("#messageBox").append("<button data-dismiss='alert' class='close'>×</button>");
$("#errorTipDiv").show(); $("#errorTipDiv").show();
return; return;
} }

2
src/main/webapp/WEB-INF/views/dashboard/newAppTypeList.jsp
View File

@@ -104,6 +104,8 @@ function ajaxAppList(start,end,entranceId){
success:function (data){ success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){ if(data!=null&&data.length>0&&data[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'/>");
$("#messageBox").html(data[0].error);
$("#messageBox").append("<button data-dismiss='alert' class='close'>×</button>");
$("#errorTipDiv").show(); $("#errorTipDiv").show();
return; return;
} }

5
src/main/webapp/WEB-INF/views/dashboard/newBandWidthList.jsp
View File

@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8"%> <%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%> <%@ include file="/WEB-INF/include/taglib.jsp"%>
<div class="col-md-12"> <div class="col-md-12">
<div id="errorTipDiv" style="display: none;padding-top: 3px;"><sys:message content="server_internal_error"/></div> <div id="errorTipDiv" style="display: none;padding-top: 3px;"><sys:message content='server_internal_error'/></div>
<div class="row"> <div class="row">
<div id="chartDiv1" class="col-md-12"> <div id="chartDiv1" class="col-md-12">
<div id="trend" style="height: 500px; position: relative;" > <div id="trend" style="height: 500px; position: relative;" >
@@ -92,7 +92,8 @@ function changeBandwidth(unitType,beginDate,endDate){
timeout:50000, timeout:50000,
success:function (data){ success:function (data){
if(data!=null && data.error!=null){ if(data!=null && data.error!=null){
// top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>"); $("#messageBox").html(data.error);
$("#messageBox").append("<button data-dismiss='alert' class='close'>×</button>");
$("#errorTipDiv").show(); $("#errorTipDiv").show();
return; return;
} }

2
src/main/webapp/WEB-INF/views/dashboard/newDomainsList.jsp
View File

@@ -117,6 +117,8 @@
// top.$.jBox.tip( // top.$.jBox.tip(
// "<spring:message code='request_service_failed'/>", // "<spring:message code='request_service_failed'/>",
// "<spring:message code='info'/>"); // "<spring:message code='info'/>");
$("#messageBox").html(data[0].error);
$("#messageBox").append("<button data-dismiss='alert' class='close'>×</button>");
$("#errorTipDiv").show(); $("#errorTipDiv").show();
return; return;
} }

2
src/main/webapp/WEB-INF/views/dashboard/newProtocolTypeList.jsp
View File

@@ -105,6 +105,8 @@ function ajaxProtocolList(start,end,entranceId){
success:function (data){ success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){ if(data!=null&&data.length>0&&data[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'/>");
$("#messageBox").html(data[0].error);
$("#messageBox").append("<button data-dismiss='alert' class='close'>×</button>");
$("#errorTipDiv").show(); $("#errorTipDiv").show();
return; return;
} }

2
src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDList.jsp
View File

@@ -102,6 +102,8 @@ function ajaxSubscriberIDList(start,end,entranceId){
success:function (data){ success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){ if(data!=null&&data.length>0&&data[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'/>");
$("#messageBox").html(data[0].error);
$("#messageBox").append("<button data-dismiss='alert' class='close'>×</button>");
$("#errorTipDiv").show(); $("#errorTipDiv").show();
return; return;
} }