|
@@ -771,6 +771,7 @@ public class HBaseUtil {
|
|
|
// 6 status String 状态 conn/disconn
|
|
|
// 7 receivetime String 时间 最近通讯时间
|
|
|
// 8 detail String 详情
|
|
|
+ // 9 manual_inspection String 人工检查记录
|
|
|
|
|
|
if (!tableExist(agent, DB, tableName)) {
|
|
|
JSONArray Columns = new JSONArray();
|
|
@@ -782,6 +783,7 @@ public class HBaseUtil {
|
|
|
Columns.add(CreateJSON("status", "String"));
|
|
|
Columns.add(CreateJSON("receivetime", "String"));
|
|
|
Columns.add(CreateJSON("detail", "String"));
|
|
|
+ Columns.add(CreateJSON("manual_inspection", "String"));
|
|
|
|
|
|
JSONArray Key = new JSONArray();
|
|
|
Key.add("project");
|
|
@@ -807,6 +809,7 @@ public class HBaseUtil {
|
|
|
// 5 address_4 String 四级地址 主键
|
|
|
// 6 receivetime String 时间 主键,触发时间
|
|
|
// 7 function String 通讯功能 主键,conn/disconn
|
|
|
+ // 8 manual_inspection String 人工检查记录
|
|
|
|
|
|
if (!tableExist(agent, DB, tableName)) {
|
|
|
JSONArray Columns = new JSONArray();
|
|
@@ -817,6 +820,7 @@ public class HBaseUtil {
|
|
|
Columns.add(CreateJSON("address_4", "String"));
|
|
|
Columns.add(CreateJSON("receivetime", "String"));
|
|
|
Columns.add(CreateJSON("function", "String"));
|
|
|
+ Columns.add(CreateJSON("manual_inspection", "String"));
|
|
|
|
|
|
JSONArray Key = new JSONArray();
|
|
|
Key.add("project");
|
|
@@ -845,6 +849,7 @@ public class HBaseUtil {
|
|
|
// 5 status String 状态
|
|
|
// 6 receivetime String 时间
|
|
|
// 7 detail String 详情
|
|
|
+ // 8 manual_inspection String 人工检查记录
|
|
|
|
|
|
if (!tableExist(agent, DB, tableName)) {
|
|
|
JSONArray Columns = new JSONArray();
|
|
@@ -855,6 +860,7 @@ public class HBaseUtil {
|
|
|
Columns.add(CreateJSON("status", "String"));
|
|
|
Columns.add(CreateJSON("receivetime", "String"));
|
|
|
Columns.add(CreateJSON("detail", "String"));
|
|
|
+ Columns.add(CreateJSON("manual_inspection", "String"));
|
|
|
|
|
|
JSONArray Key = new JSONArray();
|
|
|
Key.add("project");
|
|
@@ -887,6 +893,7 @@ public class HBaseUtil {
|
|
|
// 其中采集节点反馈标识,分两级,分别为:
|
|
|
// 1、success/fail
|
|
|
// 2、如success,该级空;如fail,则该级描述fail原因
|
|
|
+ // 9 manual_inspection String 人工检查记录
|
|
|
|
|
|
if (!tableExist(agent, DB, tableName)) {
|
|
|
JSONArray Columns = new JSONArray();
|
|
@@ -898,6 +905,7 @@ public class HBaseUtil {
|
|
|
Columns.add(CreateJSON("seq", "Long"));
|
|
|
Columns.add(CreateJSON("function", "String"));
|
|
|
Columns.add(CreateJSON("feedback", "String"));
|
|
|
+ Columns.add(CreateJSON("manual_inspection", "String"));
|
|
|
|
|
|
JSONArray Key = new JSONArray();
|
|
|
Key.add("project");
|
|
@@ -925,6 +933,7 @@ public class HBaseUtil {
|
|
|
// 4 status String 状态
|
|
|
// 5 receivetime String 时间
|
|
|
// 6 detail String 详情
|
|
|
+ // 7 manual_inspection String 人工检查记录
|
|
|
|
|
|
if (!tableExist(agent, DB, tableName)) {
|
|
|
JSONArray Columns = new JSONArray();
|
|
@@ -934,6 +943,7 @@ public class HBaseUtil {
|
|
|
Columns.add(CreateJSON("status", "String"));
|
|
|
Columns.add(CreateJSON("receivetime", "String"));
|
|
|
Columns.add(CreateJSON("detail", "String"));
|
|
|
+ Columns.add(CreateJSON("manual_inspection", "String"));
|
|
|
|
|
|
JSONArray Key = new JSONArray();
|
|
|
Key.add("project");
|
|
@@ -956,6 +966,7 @@ public class HBaseUtil {
|
|
|
// 3 updown String 上/下行 主键
|
|
|
// 4 receivetime String 时间 主键
|
|
|
// 5 function String 通讯功能 主键
|
|
|
+ // 6 manual_inspection String 人工检查记录
|
|
|
|
|
|
if (!tableExist(agent, DB, tableName)) {
|
|
|
JSONArray Columns = new JSONArray();
|
|
@@ -964,6 +975,7 @@ public class HBaseUtil {
|
|
|
Columns.add(CreateJSON("updown", "String"));
|
|
|
Columns.add(CreateJSON("receivetime", "String"));
|
|
|
Columns.add(CreateJSON("function", "String"));
|
|
|
+ Columns.add(CreateJSON("manual_inspection", "String"));
|
|
|
|
|
|
JSONArray Key = new JSONArray();
|
|
|
Key.add("project");
|
|
@@ -987,6 +999,7 @@ public class HBaseUtil {
|
|
|
// 2 status String 状态
|
|
|
// 3 receivetime String 时间
|
|
|
// 4 detail String 详情
|
|
|
+ // 5 manual_inspection String 人工检查记录
|
|
|
|
|
|
if (!tableExist(agent, DB, tableName)) {
|
|
|
JSONArray Columns = new JSONArray();
|
|
@@ -994,6 +1007,7 @@ public class HBaseUtil {
|
|
|
Columns.add(CreateJSON("status", "String"));
|
|
|
Columns.add(CreateJSON("receivetime", "String"));
|
|
|
Columns.add(CreateJSON("detail", "String"));
|
|
|
+ Columns.add(CreateJSON("manual_inspection", "String"));
|
|
|
|
|
|
JSONArray Key = new JSONArray();
|
|
|
Key.add("project");
|
|
@@ -1012,12 +1026,14 @@ public class HBaseUtil {
|
|
|
// 1 project String 项目名 主键
|
|
|
// 2 receivetime String 时间 主键
|
|
|
// 3 function String 通讯功能 主键
|
|
|
+ // 4 manual_inspection String 人工检查记录
|
|
|
|
|
|
if (!tableExist(agent, DB, tableName)) {
|
|
|
JSONArray Columns = new JSONArray();
|
|
|
Columns.add(CreateJSON("project", "String"));
|
|
|
Columns.add(CreateJSON("receivetime", "String"));
|
|
|
Columns.add(CreateJSON("function", "String"));
|
|
|
+ Columns.add(CreateJSON("manual_inspection", "String"));
|
|
|
|
|
|
JSONArray Key = new JSONArray();
|
|
|
Key.add("project");
|
|
@@ -1446,6 +1462,7 @@ public class HBaseUtil {
|
|
|
// 6 status String 状态 conn/disconn
|
|
|
// 7 receivetime String 时间 最近通讯时间
|
|
|
// 8 detail String 详情
|
|
|
+ // 9 manual_inspection String 人工检查记录
|
|
|
if (addressNull(address_1, address_2, address_3, address_4)) {
|
|
|
return;
|
|
|
}
|
|
@@ -1465,6 +1482,7 @@ public class HBaseUtil {
|
|
|
InsertObject.put("status", status);
|
|
|
InsertObject.put("receivetime", receivetime);
|
|
|
InsertObject.put("detail", detail);
|
|
|
+ InsertObject.put("manual_inspection", "");
|
|
|
|
|
|
InsertObjects.add(InsertObject);
|
|
|
|
|
@@ -1541,6 +1559,7 @@ public class HBaseUtil {
|
|
|
// 5 status String 状态
|
|
|
// 6 receivetime String 时间
|
|
|
// 7 detail String 详情
|
|
|
+ // 8 manual_inspection String 人工检查记录
|
|
|
|
|
|
JSONArray InsertObjects = new JSONArray();
|
|
|
try {
|
|
@@ -1557,6 +1576,7 @@ public class HBaseUtil {
|
|
|
InsertObject.put("status", status);
|
|
|
InsertObject.put("receivetime", receivetime);
|
|
|
InsertObject.put("detail", detail);
|
|
|
+ InsertObject.put("manual_inspection", "");
|
|
|
|
|
|
InsertObjects.add(InsertObject);
|
|
|
|
|
@@ -1638,6 +1658,7 @@ public class HBaseUtil {
|
|
|
// 4 status String 状态
|
|
|
// 5 receivetime String 时间
|
|
|
// 6 detail String 详情
|
|
|
+ // 7 manual_inspection String 人工检查记录
|
|
|
|
|
|
JSONArray InsertObjects = new JSONArray();
|
|
|
try {
|
|
@@ -1653,6 +1674,7 @@ public class HBaseUtil {
|
|
|
InsertObject.put("status", status);
|
|
|
InsertObject.put("receivetime", receivetime);
|
|
|
InsertObject.put("detail", detail);
|
|
|
+ InsertObject.put("manual_inspection", "");
|
|
|
|
|
|
InsertObjects.add(InsertObject);
|
|
|
|
|
@@ -1718,6 +1740,7 @@ public class HBaseUtil {
|
|
|
// 2 status String 状态
|
|
|
// 3 receivetime String 时间
|
|
|
// 4 detail String 详情
|
|
|
+ // 5 manual_inspection String 人工检查记录
|
|
|
|
|
|
JSONArray InsertObjects = new JSONArray();
|
|
|
try {
|
|
@@ -1731,6 +1754,7 @@ public class HBaseUtil {
|
|
|
InsertObject.put("status", status);
|
|
|
InsertObject.put("receivetime", receivetime);
|
|
|
InsertObject.put("detail", detail);
|
|
|
+ InsertObject.put("manual_inspection", "");
|
|
|
|
|
|
InsertObjects.add(InsertObject);
|
|
|
|