gfwleak/nms-oam
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.监测页面增加时间选择限制，只能选取一周内时间

Browse Source 
2.增加数据清除异常处理
This commit is contained in:
wangwenrui
2019-01-18 18:46:58 +08:00
parent b1ec7f1cc4
commit 5b9c2c792d
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gloam/WebRoot/detection/chart-cpudisk.html
View File

@@ -188,7 +188,7 @@ function createChart() {
<input type="hidden" name="titleId" value="#(titleId)"/>
<div style="margin:10px 0 10px 15px; position:relative;">
<label class="bar">#(_res.get("startTime"))</label>
<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',lang:'#(_locale)'})">&nbsp;
<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',minDate:'%y-%M-#{%d-7}',lang:'#(_locale)'})">&nbsp;
<label class="bar">#(_res.get("endTime"))</label>
<input id="endTime" value="#(endTime)" name="endTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',minDate:'#F{$dp.$D(\'startTime\')}',maxDate:'%y-%M-%d',lang:'#(_locale)'})">
<div id="search" style="display:inline-block; background-color:#ce0000; width:50px; line-height:18px; text-align:center; padding:3px 0 5px 0;position:absolute; margin-left: 10px;">

2
gloam/WebRoot/detection/chart-mem.html
View File

@@ -169,7 +169,7 @@ function createChart() {
<input type="hidden" name="titleId" value="#(titleId)"/>
<div style="margin:10px 0 10px 15px; position:relative;">
<label class="bar">#(_res.get("startTime"))</label>
<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\',lang:'#(_locale)'}'})">&nbsp;
<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',minDate:'%y-%M-#{%d-7}',lang:'#(_locale)'})">&nbsp;
<label class="bar">#(_res.get("endTime"))</label>
<input id="endTime" value="#(endTime)" name="endTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',minDate:'#F{$dp.$D(\'startTime\')}',maxDate:'%y-%M-%d',lang:'#(_locale)'})">
<div id="search" style="display:inline-block; background-color:#ce0000; width:50px; line-height:18px; text-align:center; padding:3px 0 5px 0;position:absolute; margin-left: 10px;">

2
gloam/WebRoot/detection/chart-net.html
View File

@@ -176,7 +176,7 @@ function createChart() {
<input type="hidden" name="titleId" value="#(titleId)"/>
<div style="margin:10px 0 10px 15px; position:relative;">
<label class="bar">#(_res.get("startTime"))</label>
<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',lang:'#(_locale)'})">&nbsp;
<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',minDate:'%y-%M-#{%d-7}',lang:'#(_locale)'})">&nbsp;
<label class="bar">#(_res.get("endTime"))</label>
<input id="endTime" value="#(endTime)" name="endTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',minDate:'#F{$dp.$D(\'startTime\')}',maxDate:'%y-%M-%d',lang:'#(_locale)'})">
<div id="search" style="display:inline-block; background-color:#ce0000; width:50px; line-height:18px; text-align:center; padding:3px 0 5px 0;position:absolute; margin-left: 10px;">

2
gloam/WebRoot/detection/detectionInfoNew-setDetail.html
View File

@@ -83,7 +83,7 @@ function mydown(obj) {
<div style="margin:0 0 10px 15px; position:relative;">
<form id="my-form" action="">
<label class="bar">#(_res.get("startTime"))</label>
<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',lang:'#(_locale)'})">&nbsp;
<input id="startTime" value="#(startTime)" name="startTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',maxDate:'#F{$dp.$D(\'endTime\')||\'%y-%M-%d\'}',minDate:'%y-%M-#{%d-7}',lang:'#(_locale)'})">&nbsp;
<label class="bar">#(_res.get("endTime"))</label>
<input id="endTime" value="#(endTime)" name="endTime" class="bar bar-input" onfocus="this.blur()" onclick="WdatePicker({skin:'simple',minDate:'#F{$dp.$D(\'startTime\')}',maxDate:'%y-%M-%d',lang:'#(_locale)'})">
<div id="search" style="display:inline-block; background-color:#ce0000; width:50px; line-height:18px; text-align:center; padding:3px 0 5px 0;position:absolute; margin-left: 10px;">

12
gloam/src/com/nis/gloam/task/LogTimerTask.java
View File

@@ -24,9 +24,15 @@ public class LogTimerTask extends TimerTask {
}
@Override
public void run() {
int date = 7;//默认七天
try {
PropKit.use("config.properties");
date=Integer.parseInt(PropKit.get("delete_logtime"));
} catch (Exception e) {
logger.info("获取时间配置失败！使用默认时间："+date);
}
try {
PropKit.use("config.properties");
int date = Integer.parseInt(PropKit.get("delete_logtime"));
String[] clearTables=PropKit.get("detect_info_clear").split(",");
logger.info("clearTables-->"+Arrays.toString(clearTables));
Calendar calendar=new GregorianCalendar();
@@ -52,11 +58,13 @@ public class LogTimerTask extends TimerTask {
restart(date);
} catch (Exception e) {
logger.error("监测表清理失败！",e);
restart(date);
}
}
//定时删除日志 一周清除一次一周前的日志 可修改配置文件来设定日志保存天数
public void restart(int day){
timer.schedule(new LogTimerTask(timer), day*24*3600*1000);
logger.info("数据清除任务重启完成！");
}
}