From d94384184b45bcdccee59c3b84ea20da9daad831 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Sun, 18 Nov 2018 16:10:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1--dc=E5=8D=87=E7=BA=A7=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/nms/server/service/CommonService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/nms/server/service/CommonService.java b/src/com/nms/server/service/CommonService.java index 3cbd47e..d915b3a 100644 --- a/src/com/nms/server/service/CommonService.java +++ b/src/com/nms/server/service/CommonService.java @@ -1450,7 +1450,7 @@ public class CommonService { " on para.mission_id=t.mission_id" + " where t.mission_type = 6" + // " and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ "*24*3600 second)"; - " and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ " second)"; + " and greatest(t.create_time,ifnull(para.start_time,t.create_time))" + timeStandard + " )" +*/ // " and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ "*24*3600 second))"+ - " and greatest(t.create_time,ifnull(para.start_time,t.create_time))>date_add(now() ,interval -"+timeStandard+ " second))"+ + " and greatest(t.create_time,ifnull(para.start_time,t.create_time))"+timeStandard; - " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>"+timeStandard; + " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))<"+timeStandard; task6SucSql = "select info.ip,info.mission_id as taskIds" + " from (" + " select distinct node.node_ip as ip,rlt.mission_id as mission_id" + @@ -1493,7 +1493,7 @@ public class CommonService { " on para.mission_id=t.mission_id" + " where t.mission_type = 6" + // " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))*24*3600>" + timeStandard + - " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>" + timeStandard + + " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))<" + timeStandard + " )" + " )info " ; } From f39f23aced3a23957a79131dad02f2680539ebb7 Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Mon, 19 Nov 2018 09:59:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linuxinstall/install.sh | 2 +- src/com/nms/server/service/CommonService.java | 15 +++++++++------ .../detectDataHandler/DataResolveThread.java | 11 +++++++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/linuxinstall/install.sh b/linuxinstall/install.sh index 8938420..395e1e1 100644 --- a/linuxinstall/install.sh +++ b/linuxinstall/install.sh @@ -223,7 +223,7 @@ then fi #-----------db url -db_url="jdbc:mysql://"${db_host}":"${db_port}"/nms?useUnicode=true&characterEncoding=utf-8&useOldAliasMetadataBehavior=true&rewriteBatchedStatements=true" +db_url="jdbc:mysql://"${db_host}":"${db_port}"/nms?useUnicode=true\&characterEncoding=utf-8\&useOldAliasMetadataBehavior=true\&rewriteBatchedStatements=true" #-------------db username echo -n "enter database username: " diff --git a/src/com/nms/server/service/CommonService.java b/src/com/nms/server/service/CommonService.java index d915b3a..5a52e4d 100644 --- a/src/com/nms/server/service/CommonService.java +++ b/src/com/nms/server/service/CommonService.java @@ -1478,7 +1478,7 @@ public class CommonService { " on para.mission_id=t.mission_id" + " where t.mission_type = 6" + // " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))*24*3600>"+timeStandard; - " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))<"+timeStandard; + " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>"+timeStandard; task6SucSql = "select info.ip,info.mission_id as taskIds" + " from (" + " select distinct node.node_ip as ip,rlt.mission_id as mission_id" + @@ -1493,7 +1493,7 @@ public class CommonService { " on para.mission_id=t.mission_id" + " where t.mission_type = 6" + // " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))*24*3600>" + timeStandard + - " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))<" + timeStandard + + " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>" + timeStandard + " )" + " )info " ; } @@ -4082,7 +4082,8 @@ public class CommonService { String ifAdminStatus = detailsArr0[9];//showNum=7,1:up,2:down if("2".equals(ifAdminStatus)) { state = 0;//监测公共信息的状态 - dsinfo += "$@$端口"+ifDescr+"异常(配置状态与实际状态不符)"; +// dsinfo += "$@$端口"+ifDescr+"异常(配置状态与实际状态不符)"; + dsinfo += "i18n_server.CommonService.dsinfo1_n81i"+ifDescr+"i18n_server.CommonService.dsinfo1.exception_n81i"; detailDetectionState = "0";//当前端口的状态 pLevel = Constants.PORT_ALARM_LEVEL;//非界面设置，默认为5级 } @@ -4093,7 +4094,8 @@ public class CommonService { logger.info("test:port:inOctetsSpeed="+inOctetsSpeed+";outOctetsSpeed="+outOctetsSpeed); if((inOctetsSpeed+outOctetsSpeed)<=0) { state = 0;//监测公共信息的状态 - dsinfo += "$@$端口"+ifDescr+"异常(流量为0),inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed); +// dsinfo += "$@$端口"+ifDescr+"异常(流量为0),inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed); + dsinfo += "i18n_server.CommonService.dsinfo1_n81i"+ifDescr+"i18n_server.CommonService.dsinfo2.exception_n81i,inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed); detailDetectionState = "0";//当前端口的状态 pLevel = Constants.PORT_ALARM_LEVEL;//非界面设置，默认为5级 } @@ -4156,9 +4158,10 @@ public class CommonService { filedComments = tm==null?"":tm.getFiledComments(); } cpInfo += " "+(StringUtils.isEmpty(elem.getFiledCommonts())?filedName:elem.getFiledCommonts()); - cpInfo += " 为："+detail.get(filedName); + cpInfo += " i18n_server.CommonService.for_n81i："+detail.get(filedName); cpInfo += (elem.getPoliceUnit()==null ? "" : "null".equals(elem.getPoliceUnit()) ? "" : elem.getPoliceUnit()); - cpInfo += " 报警级别："+pLevel; +// cpInfo += " 报警级别："+pLevel; + cpInfo += " i18n_server.CommonService.policyLevel_n81i："+pLevel; cpInfo += " \n"; } } diff --git a/src/com/nms/server/thread/detectDataHandler/DataResolveThread.java b/src/com/nms/server/thread/detectDataHandler/DataResolveThread.java index e67c3f0..d5d2a14 100644 --- a/src/com/nms/server/thread/detectDataHandler/DataResolveThread.java +++ b/src/com/nms/server/thread/detectDataHandler/DataResolveThread.java @@ -1019,7 +1019,8 @@ public class DataResolveThread implements Runnable{ String ifAdminStatus = detailsArr0[9];//showNum=7,1:up,2:down if("2".equals(ifAdminStatus)) { state = 0;//监测公共信息的状态 - dsinfo += "$@$端口"+ifDescr+"异常(配置状态与实际状态不符)"; +// dsinfo += "$@$端口"+ifDescr+"异常(配置状态与实际状态不符)"; + dsinfo += "i18n_server.CommonService.dsinfo1_n81i"+ifDescr+"i18n_server.CommonService.dsinfo1.exception_n81i"; detailDetectionState = "0";//当前端口的状态 pLevel = Constants.PORT_ALARM_LEVEL;//非界面设置，默认为5级 } @@ -1030,7 +1031,8 @@ public class DataResolveThread implements Runnable{ logger.info("test:port:inOctetsSpeed="+inOctetsSpeed+";outOctetsSpeed="+outOctetsSpeed); if((inOctetsSpeed+outOctetsSpeed)<=0) { state = 0;//监测公共信息的状态 - dsinfo += "$@$端口"+ifDescr+"异常(流量为0),inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed); +// dsinfo += "$@$端口"+ifDescr+"异常(流量为0),inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed); + dsinfo += "i18n_server.CommonService.dsinfo1_n81i"+ifDescr+"i1n8_server.CommonService.dsinfo1.exception_n81i,inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed); detailDetectionState = "0";//当前端口的状态 pLevel = Constants.PORT_ALARM_LEVEL;//非界面设置，默认为5级 } @@ -1093,9 +1095,10 @@ public class DataResolveThread implements Runnable{ filedComments = tm==null?"":tm.getFiledComments(); } cpInfo += " "+(StringUtils.isEmpty(elem.getFiledCommonts())?filedName:elem.getFiledCommonts()); - cpInfo += " 为："+detail.get(filedName); + cpInfo += " i18n_server.CommonService.for_n81i："+detail.get(filedName); cpInfo += (elem.getPoliceUnit()==null ? "" : "null".equals(elem.getPoliceUnit()) ? "" : elem.getPoliceUnit()); - cpInfo += " 报警级别："+pLevel; +// cpInfo += " 报警级别："+pLevel; + cpInfo += " i18n_server.CommonService.policyLevel_n81i："+pLevel; cpInfo += " \n"; } } From ba1c9599dced55654b2e0f2f70cc90874fee9e39 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Wed, 21 Nov 2018 11:28:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8Ddc?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8A=A0=E8=BD=BD=E6=96=B0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/nms/server/service/UpgradeService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/nms/server/service/UpgradeService.java b/src/com/nms/server/service/UpgradeService.java index ae5a3b9..c0dc3df 100644 --- a/src/com/nms/server/service/UpgradeService.java +++ b/src/com/nms/server/service/UpgradeService.java @@ -72,9 +72,9 @@ public class UpgradeService extends CommonService{ // searchSQL.append("and (mst.end_time>sysdate or mst.end_time is null) ");// 周期任务（未过时） or 非周期任务 if (missionId!=null && missionId.longValue() !=0l) { searchSQL.append("and mst.mission_id = '"+missionId.longValue()+"' "); - }else{ - searchSQL.append("and mst.mission_state in (1,5) "); //以创建任务 准备撤销任务 均作为新任务周期性载入 } + searchSQL.append("and mst.mission_state in (1,5) "); //以创建任务 准备撤销任务 均作为新任务周期性载入 + searchSQL.append("order by mst.create_time,mst.mission_id asc "); ArrayList fields = new ArrayList(); fields.add("mission_id");