|
@@ -190,9 +190,9 @@ public class CheckThread extends Thread {
|
|
|
meter, "up", status, Constant.format(new Date()), "");
|
|
|
if (
|
|
|
// Ê×´Î
|
|
|
- !this.meterStatus.containsKey(meter) || null == this.meterStatus.get(meter) ||
|
|
|
+ !this.meterStatus.containsKey(pm) || null == this.meterStatus.get(pm) ||
|
|
|
// ÒÑÓмǼ
|
|
|
- !status.equalsIgnoreCase(this.meterStatus.get(meter))) {
|
|
|
+ !status.equalsIgnoreCase(this.meterStatus.get(pm))) {
|
|
|
|
|
|
HBaseUtil.Insert_ps_virtual_meter_log(Constant.agent, Constant.BuildingDB.get(project), project,
|
|
|
meter, "up", Constant.format(new Date()), status);
|
|
@@ -201,7 +201,7 @@ public class CheckThread extends Thread {
|
|
|
// TODO Auto-generated catch block
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
- this.meterStatus.put(meter, status);
|
|
|
+ this.meterStatus.put(pm, status);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -212,6 +212,9 @@ public class CheckThread extends Thread {
|
|
|
String[] pl = physical.split(";");
|
|
|
String project = pl[0];
|
|
|
String address_1 = pl.length < 2 ? "" : pl[1];
|
|
|
+ if ("".equalsIgnoreCase(address_1)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
String address_2 = pl.length < 3 ? "" : pl[2];
|
|
|
String address_3 = pl.length < 4 ? "" : pl[3];
|
|
|
String address_4 = pl.length < 5 ? "" : pl[4];
|