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

1.snmp对1.3.6.1.4.1.5000000.1.4.1.1.3特殊处理

Browse Source 
2.不执行其他system的任务
This commit is contained in:
chenjinsong
2018-10-30 13:57:52 +08:00
parent 6850bf8980
commit 32a1746aaa
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/nms/server/common/Constants.java
View File

@@ -411,6 +411,8 @@ public class Constants {
// public static final Integer TEST_COMPUTER;
// public static final Integer TEST_SWITCH;
//static final 自变量的初始化
//当前业务系统id
public static final String CURRENT_SYSTEM_ID;
public static final String DB_TYPE;
public static final boolean IS_MYSQL;
@@ -779,6 +781,9 @@ public class Constants {
/**
* 是否是 mysql 数据库
*/
CURRENT_SYSTEM_ID = Config.getString("system.id", "-1");
IS_MYSQL = "mysql".equalsIgnoreCase(DB_TYPE);
/**
* //dc监测数据入库模式，1：由web 主控控制入库，2：自己主动入库

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

@@ -55,6 +55,8 @@ public class UpgradeService extends CommonService{
*/
public ArrayList<MissionStateTable> getNewMessionList(Long missionId){
//-- 查询可执行的任务
String systemSql = "-1".equals(Constants.CURRENT_SYSTEM_ID) ? "" : "and mst.system_id=" + Constants.CURRENT_SYSTEM_ID + " ";
StringBuffer searchSQL = new StringBuffer();
searchSQL.append("select mst.mission_id,");
searchSQL.append("mst.mission_type,");
@@ -67,6 +69,7 @@ public class UpgradeService extends CommonService{
searchSQL.append("mst.loop_delay ");
searchSQL.append("from mission_state_table mst ");
searchSQL.append("where 1=1 ");
searchSQL.append(systemSql);
//2012-03-20 取消任务时间过滤，将对所有任务进行处理
// searchSQL.append("and (mst.end_time>sysdate or mst.end_time is null) ");// 周期任务（未过时） or 非周期任务
if (missionId!=null && missionId.longValue() !=0l) {
@@ -123,6 +126,8 @@ public class UpgradeService extends CommonService{
*/
public ArrayList<MissionStateTable> getStartMessionList(String ids){
//-- 查询可执行的任务
String systemSql = "-1".equals(Constants.CURRENT_SYSTEM_ID) ? "" : "and mst.system_id=" + Constants.CURRENT_SYSTEM_ID + " ";
StringBuffer searchSQL = new StringBuffer();
searchSQL.append("select mst.mission_id,");
searchSQL.append("mst.mission_type,");
@@ -135,6 +140,7 @@ public class UpgradeService extends CommonService{
searchSQL.append("mst.loop_delay ");
searchSQL.append("from mission_state_table mst ");
searchSQL.append("where 1=1 ");
searchSQL.append(systemSql);
// searchSQL.append("and (mst.end_time>sysdate or mst.end_time is null) ");
searchSQL.append("and mst.mission_state in(2,6) ");
if(StringUtils.isNotEmpty(ids)){

16
src/com/nms/server/util/SNMP4JUtils.java
View File

@@ -411,6 +411,13 @@ public class SNMP4JUtils {
OID oid = vb.getOid();
String index = oid.last()+"";//索引
String oidStr = oid.toString();
if (rootOid.equals("1.3.6.1.4.1.5000000.1.4.1.1.3")) {
logger.info("对5000000.1.4.1.1.3进行特殊处理");
String[] p = oidStr.substring(rootOid.length()).split("[.]");
if (p.length == 3) {
oidStr = rootOid + "." + p[1];
}
}
oidStr = oidStr.substring(0, oidStr.lastIndexOf("."));
if(oidModel.contains(oidStr)){
Map<String, String> map = mapInstance.get(index);
@@ -513,7 +520,7 @@ public class SNMP4JUtils {
oidModel.add("1.3.6.1.2.1.1.6");
oidModel.add("1.3.6.1.2.1.1.7");*/
// [1.3.6.1.2.1.31.1.1.1.1, 1.3.6.1.2.1.31.1.1.1.2, 1.3.6.1.2.1.31.1.1.1.3, 1.3.6.1.2.1.31.1.1.1.4, 1.3.6.1.2.1.31.1.1.1.5, 1.3.6.1.2.1.31.1.1.1.6, 1.3.6.1.2.1.31.1.1.1.7, 1.3.6.1.2.1.31.1.1.1.8, 1.3.6.1.2.1.31.1.1.1.9, 1.3.6.1.2.1.31.1.1.1.10, 1.3.6.1.2.1.31.1.1.1.11, 1.3.6.1.2.1.31.1.1.1.12, 1.3.6.1.2.1.31.1.1.1.13, 1.3.6.1.2.1.31.1.1.1.14, 1.3.6.1.2.1.31.1.1.1.15, 1.3.6.1.2.1.31.1.1.1.17, 1.3.6.1.2.1.31.1.1.1.16, 1.3.6.1.2.1.31.1.1.1.19, 1.3.6.1.2.1.31.1.1.1.18]
oidModel.add("1.3.6.1.4.1.1000.4.3.1.1");
/* oidModel.add("1.3.6.1.4.1.1000.4.3.1.1");
oidModel.add("1.3.6.1.4.1.1000.4.3.1.2");
oidModel.add("1.3.6.1.4.1.1000.4.3.1.3");
oidModel.add("1.3.6.1.4.1.1000.4.3.1.4");
@@ -522,10 +529,11 @@ public class SNMP4JUtils {
oidModel.add("1.3.6.1.4.1.1000.4.3.1.7");
oidModel.add("1.3.6.1.4.1.1000.4.3.1.8");
oidModel.add("1.3.6.1.4.1.1000.4.3.1.9");
oidModel.add("1.3.6.1.4.1.1000.4.3.1.10");
oidModel.add("1.3.6.1.4.1.1000.4.3.1.10");*/
oidModel.add("1.3.6.1.4.1.5000000.1.4.1.1.3");
//String oid = "1.3.6.1.2.1.1";
String oid = "1.3.6.1.4.1.1000.4.3.1";
String host = "10.0.6.230";
String oid = "1.3.6.1.4.1.5000000.1.4.1.1.3";
String host = "10.3.2.9";
String port = "161";
String community = "public";
int retries = 3;

4
src/myconfig.properties
View File

@@ -2,7 +2,7 @@
##--公共数据存放父目录（*部署需修改*）
common.datas.dir = D:/nms/nmsdata
##--系统SNMP监测，指定服务器IP 指本机（*部署需修改*）
system.inet.address = 10.0.6.114
system.inet.address = 127.0.0.1
##--NMSWeb端 通讯IP 指WEB（*部署需修改*）
web.socket.ip = 10.0.6.114
#--数据库驱动
@@ -10,7 +10,7 @@ web.socket.ip = 10.0.6.114
db.driver=com.mysql.jdbc.Driver
##--数据库 地址（*部署需修改*）
#db.url = jdbc:oracle:thin:@10.0.6.100:1521:ict
db.url = jdbc:mysql://10.0.6.123:3306/nms?useUnicode=true&characterEncoding=utf-8&useOldAliasMetadataBehavior=true&rewriteBatchedStatements=true
db.url = jdbc:mysql://localhost:3306/nms?useUnicode=true&characterEncoding=utf-8&useOldAliasMetadataBehavior=true&rewriteBatchedStatements=true
##--数据库 用户名（*部署需修改*）
#db.username = nms
db.username = nms