|
@@ -187,11 +187,22 @@ public class Main {
|
|
|
|
|
|
for (String db : dbList.keySet()) {
|
|
|
try {
|
|
|
+
|
|
|
createDB(db);
|
|
|
- Thread.sleep(Constant.Millisecond.SECOND_1);
|
|
|
- // dropTB(db);
|
|
|
+ // //V1.0点位日志结构
|
|
|
+ // {
|
|
|
// Thread.sleep(Constant.Millisecond.SECOND_1);
|
|
|
- createTB(db);
|
|
|
+ // // dropTB(db);
|
|
|
+ // // Thread.sleep(Constant.Millisecond.SECOND_1);
|
|
|
+ // createTB(db);
|
|
|
+ // }
|
|
|
+ // V2.0点位日志结构
|
|
|
+ {
|
|
|
+ dropTB2(db);
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_1);
|
|
|
+ createTB2(db);
|
|
|
+ }
|
|
|
+
|
|
|
Thread.sleep(Constant.Millisecond.SECOND_1);
|
|
|
} catch (InterruptedException e) {
|
|
|
// TODO Auto-generated catch block
|
|
@@ -201,6 +212,114 @@ public class Main {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private static void createTB2(String db) {
|
|
|
+ // TODO Auto-generated method stub
|
|
|
+ try {
|
|
|
+ HBaseUtil.CreateTable(Constant.agent, db, "original_month");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+ HBaseUtil.CreateTable_present(Constant.agent, db, "original_present");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+ HBaseUtil.CreateTable_set(Constant.agent, db, "originalset");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+ HBaseUtil.CreateTable_setpresent(Constant.agent, db, "originalset_present");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+ // dy_pointlist
|
|
|
+ HBaseUtil.CreateTable_dy_pointlist(Constant.agent, db, "dy_pointlist");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_physical_status
|
|
|
+ HBaseUtil.CreateTable_ps_physical_status(Constant.agent, db, "ps_physical_status");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_physical_log
|
|
|
+ HBaseUtil.CreateTable_ps_physical_log(Constant.agent, db, "ps_physical_log");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_point_status
|
|
|
+ HBaseUtil.CreateTable_ps_virtual_point_status(Constant.agent, db, "ps_virtual_point_status");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_point_log
|
|
|
+ HBaseUtil.CreateTable_ps_virtual_point_log(Constant.agent, db, "ps_virtual_point_log");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_meter_status
|
|
|
+ HBaseUtil.CreateTable_ps_virtual_meter_status(Constant.agent, db, "ps_virtual_meter_status");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_meter_log
|
|
|
+ HBaseUtil.CreateTable_ps_virtual_meter_log(Constant.agent, db, "ps_virtual_meter_log");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_project_status
|
|
|
+ HBaseUtil.CreateTable_ps_virtual_project_status(Constant.agent, db, "ps_virtual_project_status");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_project_log
|
|
|
+ HBaseUtil.CreateTable_ps_virtual_project_log(Constant.agent, db, "ps_virtual_project_log");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_30);
|
|
|
+ } catch (Exception e) {
|
|
|
+ // TODO Auto-generated catch block
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private static void dropTB2(String db) {
|
|
|
+ // TODO Auto-generated method stub
|
|
|
+ try {
|
|
|
+ Constant.agent.DDL_DropTable(db, "original_month");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+ Constant.agent.DDL_DropTable(db, "original_present");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+ Constant.agent.DDL_DropTable(db, "originalset");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+ Constant.agent.DDL_DropTable(db, "originalset_present");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+ // dy_pointlist
|
|
|
+ Constant.agent.DDL_DropTable(db, "dy_pointlist");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_physical_status
|
|
|
+ Constant.agent.DDL_DropTable(db, "ps_physical_status");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_physical_log
|
|
|
+ Constant.agent.DDL_DropTable(db, "ps_physical_log");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_point_status
|
|
|
+ Constant.agent.DDL_DropTable(db, "ps_virtual_point_status");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_point_log
|
|
|
+ Constant.agent.DDL_DropTable(db, "ps_virtual_point_log");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_meter_status
|
|
|
+ Constant.agent.DDL_DropTable(db, "ps_virtual_meter_status");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_meter_log
|
|
|
+ Constant.agent.DDL_DropTable(db, "ps_virtual_meter_log");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_project_status
|
|
|
+ Constant.agent.DDL_DropTable(db, "ps_virtual_project_status");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ // ps_virtual_project_log
|
|
|
+ Constant.agent.DDL_DropTable(db, "ps_virtual_project_log");
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_3);
|
|
|
+
|
|
|
+ Thread.sleep(Constant.Millisecond.SECOND_30);
|
|
|
+ } catch (Exception e) {
|
|
|
+ // TODO Auto-generated catch block
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private static void createTB(String db) {
|
|
|
// TODO Auto-generated method stub
|
|
|
try {
|
|
@@ -273,7 +392,7 @@ public class Main {
|
|
|
configuration.addResource(new FileInputStream(System.getProperty("user.dir") + resource));
|
|
|
String zookeeper_connectionAddress = "zookeeper1:2181,zookeeper2:2181,zookeeper3:2181";
|
|
|
|
|
|
- if ("test".equalsIgnoreCase(args[0])) {
|
|
|
+ if (args != null && args.length > 0 && "test".equalsIgnoreCase(args[0])) {
|
|
|
// zookeeper_connectionAddress =
|
|
|
// "zk01.td.com:2181,zk02.td.com:2181,zk03.td.com:2181";
|
|
|
zookeeper_connectionAddress = "zookeeper1,zookeeper2,zookeeper3";
|