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

Merge branch 'dev' of git@192.168.10.125:nms/nmsserver.git into dev

Browse Source
This commit is contained in:
fangshunjian
2018-11-21 13:26:53 +08:00
parent e0737f8a42 ba1c9599dc
commit dcb7995f88
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linuxinstall/install.sh
View File

@@ -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: "

15
src/com/nms/server/service/CommonService.java
View File

@@ -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))<date_add(now() ,interval -"+timeStandard+ " second)";
task6SucSql = "select info.ip,info.mission_id as taskIds" +
" from (" +
" select distinct node.node_ip as ip,rlt.mission_id as mission_id" +
@@ -1467,7 +1467,7 @@ public class CommonService {
/* " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))*24*3600>" + 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))<date_add(now() ,interval -"+timeStandard+ " second))"+
" )info " ;
}else{
task6AllSql = "select distinct t.mission_id,para.node_groups_id,para.node_ips_id, " +
@@ -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";
}
}

4
src/com/nms/server/service/UpgradeService.java
View File

@@ -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<String> fields = new ArrayList<String>();
fields.add("mission_id");

11
src/com/nms/server/thread/detectDataHandler/DataResolveThread.java
View File

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