国际化

2 files changed, 16 insertions, 10 deletions

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";
 											}
 										}