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

实时报表-流量统计菜单-统计中的配置统计模块

Browse Source 
1.时间粒度最大范围调整 5分钟（一个月） 小时（一个月） 天（一年）
2.查询配置ID的规则名称时，取消is_valid=1的查询条件
This commit is contained in:
shangguanyanfei
2019-05-30 18:07:38 +08:00
parent 5dc3136724
commit 91aaf716c8
3 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,11 +198,14 @@ public class ConfigStatisticsController extends BaseController {
}
}
String cfgDesc="";
if(entity1.getServiceId().equals("400")){//ASN IP(特殊的业务，需单独查询)
cfgDesc = configStatisticService.getASNIPCfgDesc(entity1.getCfgId());
}else if(entity1.getServiceId().equals("1028")){// APP IP
cfgDesc = configStatisticService.getAPPIPCfgDesc(entity1.getCfgId());
}else{
// if(entity1.getServiceId().equals("400")){//ASN IP(特殊的业务，需单独查询)
// cfgDesc = configStatisticService.getASNIPCfgDesc(entity1.getCfgId());
// }else if(entity1.getServiceId().equals("1028")){// APP IP
// cfgDesc = configStatisticService.getAPPIPCfgDesc(entity1.getCfgId());
// }else{
// cfgDesc = configStatisticService.getCfgDescByCfgId(entity1);
// }
if(!entity1.getServiceId().equals("400") && !entity1.getServiceId().equals("1028")){
cfgDesc = configStatisticService.getCfgDescByCfgId(entity1);
}
entity1.setCfgDesc(cfgDesc);
@@ -293,11 +296,14 @@ public class ConfigStatisticsController extends BaseController {
}
}
String cfgDesc="";
if(entity1.getServiceId().equals("400")){//ASN IP(特殊的业务，需单独查询)
cfgDesc = configStatisticService.getASNIPCfgDesc(entity1.getCfgId());
}else if(entity1.getServiceId().equals("1028")){// APP IP
cfgDesc = configStatisticService.getAPPIPCfgDesc(entity1.getCfgId());
}else{
// if(entity1.getServiceId().equals("400")){//ASN IP(特殊的业务，需单独查询)
// cfgDesc = configStatisticService.getASNIPCfgDesc(entity1.getCfgId());
// }else if(entity1.getServiceId().equals("1028")){// APP IP
// cfgDesc = configStatisticService.getAPPIPCfgDesc(entity1.getCfgId());
// }else{
// cfgDesc = configStatisticService.getCfgDescByCfgId(entity1);
// }
if(!entity1.getServiceId().equals("400") && !entity1.getServiceId().equals("1028")){
cfgDesc = configStatisticService.getCfgDescByCfgId(entity1);
}
entity1.setCfgDesc(cfgDesc);

3
src/main/java/com/nis/web/dao/dashboard/codedic/ConfigStatisticDao.xml
View File

@@ -11,8 +11,7 @@
select cfg_desc from ${tableName}
<where>
is_valid=1
and service_id = #{serviceId}
service_id = #{serviceId}
and compile_id= #{cfgId}
</where>

52
src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
View File

@@ -186,7 +186,7 @@
<!-- <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> -->
<input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/>
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/>
</div>
</div>
<div class="pull-left">
@@ -197,7 +197,7 @@
<!-- <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> -->
<input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/>
value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/>
</div>
</div>
@@ -649,14 +649,14 @@ function initTimeSize(){
$("#endDate").remove();
if(size == 1){ // 5分钟
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
}else if(size == 2){ // 小时
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate1','#endDate1',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate1','#endDate1',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
}else if(size == 3){ // 天
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
}else if(size == 4){ // 月
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
@@ -671,14 +671,14 @@ function initTimeSize(){
$("#endDate").change();
if(size == 1){ // 5分钟
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
}else if(size == 2){ // 小时
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
}else if(size == 3){ // 天
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
}else if(size == 4){ // 月
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
@@ -713,14 +713,14 @@ function selectTimeSize(){
endTimeObj.attr("onchange","setEndTime('#beginDate','#endDate',24,'m','yyyy-MM-dd hh:mm:ss',false,'year')");
} */
if(size == 1){ // 5分钟
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
}else if(size == 2){ // 小时
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate1','#endDate1',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate1','#endDate1',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
}else if(size == 3){ // 天
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
}else if(size == 4){ // 月
beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
@@ -751,14 +751,14 @@ function selectTimeSize(){
$("#endDate").attr("onchange","setEndTime('#beginDate','#endDate',24,'m','yyyy-MM-dd hh:mm:ss',false)");
} */
if(size == 1){ // 5分钟
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
}else if(size == 2){ // 小时
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
}else if(size == 3){ // 天
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
}else if(size == 4){ // 月
$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");