From 91aaf716c850d33ab048c3021cc17a65e8d9c4d8 Mon Sep 17 00:00:00 2001 From: shangguanyanfei Date: Thu, 30 May 2019 18:07:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8-=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=E8=8F=9C=E5=8D=95-=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=B8=AD=E7=9A=84=E9=85=8D=E7=BD=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=201.=E6=97=B6=E9=97=B4=E7=B2=92=E5=BA=A6?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E8=8C=83=E5=9B=B4=E8=B0=83=E6=95=B4=205?= =?UTF-8?q?=E5=88=86=E9=92=9F=EF=BC=88=E4=B8=80=E4=B8=AA=E6=9C=88=EF=BC=89?= =?UTF-8?q?=20=E5=B0=8F=E6=97=B6=EF=BC=88=E4=B8=80=E4=B8=AA=E6=9C=88?= =?UTF-8?q?=EF=BC=89=20=E5=A4=A9=EF=BC=88=E4=B8=80=E5=B9=B4=EF=BC=89=202.?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=85=8D=E7=BD=AEID=E7=9A=84=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=90=8D=E7=A7=B0=E6=97=B6=EF=BC=8C=E5=8F=96=E6=B6=88?= =?UTF-8?q?is=5Fvalid=3D1=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/ConfigStatisticsController.java | 26 ++++++---- .../dashboard/codedic/ConfigStatisticDao.xml | 3 +- .../WEB-INF/views/dashboard/commonNew.jsp | 52 +++++++++---------- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java b/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java index 25b353817..c4ed10665 100644 --- a/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java +++ b/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java @@ -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); diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/ConfigStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/codedic/ConfigStatisticDao.xml index 097dfe117..2b92df3a6 100644 --- a/src/main/java/com/nis/web/dao/dashboard/codedic/ConfigStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/ConfigStatisticDao.xml @@ -11,8 +11,7 @@ select cfg_desc from ${tableName} - is_valid=1 - and service_id = #{serviceId} + service_id = #{serviceId} and compile_id= #{cfgId} diff --git a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp index f33b2484e..a72b57abf 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp @@ -186,7 +186,7 @@ + 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')"/>
@@ -197,7 +197,7 @@ + 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')"/>
@@ -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')");