From 40f7a2817f2c8d6b92a7b86d569c2c167f699d9c Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期四, 15 八月 2024 16:07:03 +0800
Subject: [PATCH] 3.新增表'db_ram_db.tb_dev6159_power_yc'-通信电源核容一体机遥测实时状态表 	4.新增表'db_ram_db.tb_dev6159_power_yx'-通信电源核容一体机遥信实时状态表

---
 BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java |  277 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 275 insertions(+), 2 deletions(-)

diff --git a/BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java b/BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java
index 876ae69..a1a4878 100644
--- a/BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java
+++ b/BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java
@@ -343,19 +343,260 @@
 				"  `dcout2_vol_dc` float NOT NULL DEFAULT '0' COMMENT '2段直流母线输出电压-DCSWIB'," + 
 				"  `dcout2_curr_dc` float NOT NULL DEFAULT '0' COMMENT '2段直流母线输出电流-DCSWIB'," + 
 				"  `dev_temp_dc` float NOT NULL DEFAULT '0' COMMENT '直流配电柜温度-DCSWIB'," + 
+				
+				"  `ac_power_freq1_ac` float NOT NULL DEFAULT '0' COMMENT '电源频率1-ACSWIB'," + 
+				"  `ac_power_freq2_ac` float NOT NULL DEFAULT '0' COMMENT '电源频率2-ACSWIB'," + 
+				"  `model_curr_cpss` float NOT NULL DEFAULT '0' COMMENT '模块电流-CPSS'," + 
+				"  `power_curr1` float NOT NULL DEFAULT '0' COMMENT 'KB上方左侧电流'," + 
+				"  `power_curr2` float NOT NULL DEFAULT '0' COMMENT 'KB上方右侧电流'," + 
+				"  `ac_freq_ac` float NOT NULL DEFAULT '0' COMMENT '交流频率'," + 
+				"  `batt1_curr` float NOT NULL DEFAULT '0' COMMENT '电池电流1'," + 
+				"  `batt2_curr` float NOT NULL DEFAULT '0' COMMENT '电池电流2'," + 
+				"  `model_total_curr` float NOT NULL DEFAULT '0' COMMENT '模块总电流'," + 
+				"  `batt_temp` float NOT NULL DEFAULT '0' COMMENT '电池温度'," + 
+				"  `envir_temp` float NOT NULL DEFAULT '0' COMMENT '环境温度'," + 
+				"  `extend_temp` float NOT NULL DEFAULT '0' COMMENT '扩展温度'," + 
+				"  `envir_humid` float NOT NULL DEFAULT '0' COMMENT '环境湿度'," + 
+				"  `batt_cap` float NOT NULL DEFAULT '0' COMMENT '电池容量'," + 
+				"  `load1_curr` float NOT NULL DEFAULT '0' COMMENT '负载1电流'," + 
+				"  `load2_curr` float NOT NULL DEFAULT '0' COMMENT '负载2电流'," + 
+				"  `load3_curr` float NOT NULL DEFAULT '0' COMMENT '负载3电流'," + 
+				"  `load4_curr` float NOT NULL DEFAULT '0' COMMENT '负载4电流'," + 
+				"  `model_online_cnt` int(11) NOT NULL DEFAULT '0' COMMENT '模块在线数'," + 
+				"  `model_limitcurr` float unsigned zerofill NOT NULL DEFAULT '000000000000' COMMENT '模块限流点'," + 
+				"  `model_overvol` float NOT NULL DEFAULT '0' COMMENT '模块过压点'," + 
+				"  `energy_funct` int(11) NOT NULL DEFAULT '0' COMMENT '节能功能'," + 
+				"  `dormant_ratio` float NOT NULL DEFAULT '0' COMMENT '休眠系数'," + 
+				"  `awaken_ratio` float NOT NULL DEFAULT '0' COMMENT '唤醒系数'," + 
+				"  `rotation_cycle` float NOT NULL DEFAULT '0' COMMENT '轮换周期'," + 
+				"  `model_base` int(11) NOT NULL DEFAULT '0' COMMENT '模块基数'," + 
+				"  `energy_test` int(11) NOT NULL DEFAULT '0' COMMENT '节能测试'," + 
+				"  `model_rated_cnt` int(11) NOT NULL DEFAULT '0' COMMENT '模块额定数量'," + 
+				"  `m1_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块1在线状态'," + 
+				"  `m2_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块2在线状态'," + 
+				"  `m3_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块3在线状态'," + 
+				"  `m4_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块4在线状态'," + 
+				"  `m5_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块5在线状态'," + 
+				"  `m6_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块6在线状态'," + 
+				"  `m7_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块7在线状态'," + 
+				"  `m8_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块8在线状态'," + 
+				"  `m9_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块9在线状态'," + 
+				"  `m10_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块10在线状态'," + 
+				"  `m11_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块11在线状态'," + 
+				"  `m12_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块12在线状态'," + 
+				"  `m13_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块13在线状态'," + 
+				"  `m14_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块14在线状态'," + 
+				"  `m15_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块15在线状态'," + 
+				"  `m16_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块16在线状态'," + 
+				"  `m17_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块17在线状态'," + 
+				"  `m18_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块18在线状态'," + 
+				"  `m19_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块19在线状态'," + 
+				"  `m20_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块20在线状态'," + 
+				"  `m21_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块21在线状态'," + 
+				"  `m22_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块22在线状态'," + 
+				"  `m23_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块23在线状态'," + 
+				"  `m24_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块24在线状态'," + 
+				"  `m25_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块25在线状态'," + 
+				"  `m26_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块26在线状态'," + 
+				"  `m27_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块27在线状态'," + 
+				"  `m28_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块28在线状态'," + 
+				"  `m29_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块29在线状态'," + 
+				"  `m30_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块30在线状态'," + 
+				"  `m31_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块31在线状态'," + 
+				"  `m32_online_st` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块32在线状态'," + 
+				"  `m1_outvol` float NOT NULL DEFAULT '0' COMMENT '模块1输出电压'," + 
+				"  `m2_outvol` float NOT NULL DEFAULT '0' COMMENT '模块2输出电压'," + 
+				"  `m3_outvol` float NOT NULL DEFAULT '0' COMMENT '模块3输出电压'," + 
+				"  `m4_outvol` float NOT NULL DEFAULT '0' COMMENT '模块4输出电压'," + 
+				"  `m5_outvol` float NOT NULL DEFAULT '0' COMMENT '模块5输出电压'," + 
+				"  `m6_outvol` float NOT NULL DEFAULT '0' COMMENT '模块6输出电压'," + 
+				"  `m7_outvol` float NOT NULL DEFAULT '0' COMMENT '模块7输出电压'," + 
+				"  `m8_outvol` float NOT NULL DEFAULT '0' COMMENT '模块8输出电压'," + 
+				"  `m9_outvol` float NOT NULL DEFAULT '0' COMMENT '模块9输出电压'," + 
+				"  `m10_outvol` float NOT NULL DEFAULT '0' COMMENT '模块10输出电压'," + 
+				"  `m11_outvol` float NOT NULL DEFAULT '0' COMMENT '模块11输出电压'," + 
+				"  `m12_outvol` float NOT NULL DEFAULT '0' COMMENT '模块12输出电压'," + 
+				"  `m13_outvol` float NOT NULL DEFAULT '0' COMMENT '模块13输出电压'," + 
+				"  `m14_outvol` float NOT NULL DEFAULT '0' COMMENT '模块14输出电压'," + 
+				"  `m15_outvol` float NOT NULL DEFAULT '0' COMMENT '模块15输出电压'," + 
+				"  `m16_outvol` float NOT NULL DEFAULT '0' COMMENT '模块16输出电压'," + 
+				"  `m17_outvol` float NOT NULL DEFAULT '0' COMMENT '模块17输出电压'," + 
+				"  `m18_outvol` float NOT NULL DEFAULT '0' COMMENT '模块18输出电压'," + 
+				"  `m19_outvol` float NOT NULL DEFAULT '0' COMMENT '模块19输出电压'," + 
+				"  `m20_outvol` float NOT NULL DEFAULT '0' COMMENT '模块20输出电压'," + 
+				"  `m21_outvol` float NOT NULL DEFAULT '0' COMMENT '模块21输出电压'," + 
+				"  `m22_outvol` float NOT NULL DEFAULT '0' COMMENT '模块22输出电压'," + 
+				"  `m23_outvol` float NOT NULL DEFAULT '0' COMMENT '模块23输出电压'," + 
+				"  `m24_outvol` float NOT NULL DEFAULT '0' COMMENT '模块24输出电压'," + 
+				"  `m25_outvol` float NOT NULL DEFAULT '0' COMMENT '模块25输出电压'," + 
+				"  `m26_outvol` float NOT NULL DEFAULT '0' COMMENT '模块26输出电压'," + 
+				"  `m27_outvol` float NOT NULL DEFAULT '0' COMMENT '模块27输出电压'," + 
+				"  `m28_outvol` float NOT NULL DEFAULT '0' COMMENT '模块28输出电压'," + 
+				"  `m29_outvol` float NOT NULL DEFAULT '0' COMMENT '模块29输出电压'," + 
+				"  `m30_outvol` float NOT NULL DEFAULT '0' COMMENT '模块30输出电压'," + 
+				"  `m31_outvol` float NOT NULL DEFAULT '0' COMMENT '模块31输出电压'," + 
+				"  `m32_outvol` float NOT NULL DEFAULT '0' COMMENT '模块32输出电压'," + 
+				"  `m1_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块1风扇1转速'," + 
+				"  `m1_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块1风扇2转速'," + 
+				"  `m2_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块2风扇1转速'," + 
+				"  `m2_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块2风扇2转速'," + 
+				"  `m3_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块3风扇1转速'," + 
+				"  `m3_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块3风扇2转速'," + 
+				"  `m4_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块4风扇1转速'," + 
+				"  `m4_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块4风扇2转速'," + 
+				"  `m5_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块5风扇1转速'," + 
+				"  `m5_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块5风扇2转速'," + 
+				"  `m6_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块6风扇1转速'," + 
+				"  `m6_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块6风扇2转速'," + 
+				"  `m7_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块7风扇1转速'," + 
+				"  `m7_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块7风扇2转速'," + 
+				"  `m8_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块8风扇1转速'," + 
+				"  `m8_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块8风扇2转速'," + 
+				"  `m9_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块9风扇1转速'," + 
+				"  `m9_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块9风扇2转速'," + 
+				"  `m10_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块10风扇1转速'," + 
+				"  `m10_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块10风扇2转速'," + 
+				"  `m11_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块11风扇1转速'," + 
+				"  `m11_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块11风扇2转速'," + 
+				"  `m12_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块12风扇1转速'," + 
+				"  `m12_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块12风扇2转速'," + 
+				"  `m13_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块13风扇1转速'," + 
+				"  `m13_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块13风扇2转速'," + 
+				"  `m14_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块14风扇1转速'," + 
+				"  `m14_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块14风扇2转速'," + 
+				"  `m15_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块15风扇1转速'," + 
+				"  `m15_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块15风扇2转速'," + 
+				"  `m16_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块16风扇1转速'," + 
+				"  `m16_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块16风扇2转速'," + 
+				"  `m17_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块17风扇1转速'," + 
+				"  `m17_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块17风扇2转速'," + 
+				"  `m18_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块18风扇1转速'," + 
+				"  `m18_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块18风扇2转速'," + 
+				"  `m19_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块19风扇1转速'," + 
+				"  `m19_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块19风扇2转速'," + 
+				"  `m20_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块20风扇1转速'," + 
+				"  `m20_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块20风扇2转速'," + 
+				"  `m21_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块21风扇1转速'," + 
+				"  `m21_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块21风扇2转速'," + 
+				"  `m22_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块22风扇1转速'," + 
+				"  `m22_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块22风扇2转速'," + 
+				"  `m23_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块23风扇1转速'," + 
+				"  `m23_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块23风扇2转速'," + 
+				"  `m24_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块24风扇1转速'," + 
+				"  `m24_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块24风扇2转速'," + 
+				"  `m25_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块25风扇1转速'," + 
+				"  `m25_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块25风扇2转速'," + 
+				"  `m26_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块26风扇1转速'," + 
+				"  `m26_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块26风扇2转速'," + 
+				"  `m27_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块27风扇1转速'," + 
+				"  `m27_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块27风扇2转速'," + 
+				"  `m28_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块28风扇1转速'," + 
+				"  `m28_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块28风扇2转速'," + 
+				"  `m29_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块29风扇1转速'," + 
+				"  `m29_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块29风扇2转速'," + 
+				"  `m30_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块30风扇1转速'," + 
+				"  `m30_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块30风扇2转速'," + 
+				"  `m31_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块31风扇1转速'," + 
+				"  `m31_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块31风扇2转速'," + 
+				"  `m32_fan1_speed` float NOT NULL DEFAULT '0' COMMENT '模块32风扇1转速'," + 
+				"  `m32_fan2_speed` float NOT NULL DEFAULT '0' COMMENT '模块32风扇2转速'," + 
+				"  `m1_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块1模块温度'," + 
+				"  `m2_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块2模块温度'," + 
+				"  `m3_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块3模块温度'," + 
+				"  `m4_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块4模块温度'," + 
+				"  `m5_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块5模块温度'," + 
+				"  `m6_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块6模块温度'," + 
+				"  `m7_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块7模块温度'," + 
+				"  `m8_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块8模块温度'," + 
+				"  `m9_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块9模块温度'," + 
+				"  `m10_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块10模块温度'," + 
+				"  `m11_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块11模块温度'," + 
+				"  `m12_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块12模块温度'," + 
+				"  `m13_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块13模块温度'," + 
+				"  `m14_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块14模块温度'," + 
+				"  `m15_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块15模块温度'," + 
+				"  `m16_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块16模块温度'," + 
+				"  `m17_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块17模块温度'," + 
+				"  `m18_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块18模块温度'," + 
+				"  `m19_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块19模块温度'," + 
+				"  `m20_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块20模块温度'," + 
+				"  `m21_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块21模块温度'," + 
+				"  `m22_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块22模块温度'," + 
+				"  `m23_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块23模块温度'," + 
+				"  `m24_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块24模块温度'," + 
+				"  `m25_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块25模块温度'," + 
+				"  `m26_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块26模块温度'," + 
+				"  `m27_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块27模块温度'," + 
+				"  `m28_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块28模块温度'," + 
+				"  `m29_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块29模块温度'," + 
+				"  `m30_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块30模块温度'," + 
+				"  `m31_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块31模块温度'," + 
+				"  `m32_model_temp` float NOT NULL DEFAULT '0' COMMENT '模块32模块温度'," + 
+				"  `m1_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块1整流器告警'," + 
+				"  `m2_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块2整流器告警'," + 
+				"  `m3_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块3整流器告警'," + 
+				"  `m4_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块4整流器告警'," + 
+				"  `m5_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块5整流器告警'," + 
+				"  `m6_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块6整流器告警'," + 
+				"  `m7_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块7整流器告警'," + 
+				"  `m8_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块8整流器告警'," + 
+				"  `m9_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块9整流器告警'," + 
+				"  `m10_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块10整流器告警'," + 
+				"  `m11_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块11整流器告警'," + 
+				"  `m12_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块12整流器告警'," + 
+				"  `m13_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块13整流器告警'," + 
+				"  `m14_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块14整流器告警'," + 
+				"  `m15_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块15整流器告警'," + 
+				"  `m16_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块16整流器告警'," + 
+				"  `m17_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块17整流器告警'," + 
+				"  `m18_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块18整流器告警'," + 
+				"  `m19_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块19整流器告警'," + 
+				"  `m20_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块20整流器告警'," + 
+				"  `m21_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块21整流器告警'," + 
+				"  `m22_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块22整流器告警'," + 
+				"  `m23_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块23整流器告警'," + 
+				"  `m24_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块24整流器告警'," + 
+				"  `m25_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块25整流器告警'," + 
+				"  `m26_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块26整流器告警'," + 
+				"  `m27_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块27整流器告警'," + 
+				"  `m28_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块28整流器告警'," + 
+				"  `m29_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块29整流器告警'," + 
+				"  `m30_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块30整流器告警'," + 
+				"  `m31_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块31整流器告警'," + 
+				"  `m32_rectifier_alm` int(11) NOT NULL DEFAULT '0' COMMENT '模块32整流器告警'," +
+				
 				"  PRIMARY KEY (`num`)," + 
 				"  UNIQUE KEY `idx_dev_id` (`dev_id`) USING BTREE" + 
 				") ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='通信电源核容一体机遥测实时状态表';" + 
 				";";
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
+		ResultSet res = null;
 		try {
 			if(true == recreate) {			
 				sql.sqlMysqlExecute(sql_str01);
 			}
-			sql.sqlMysqlExecute(sql_str02);	
+			sql.sqlMysqlExecute(sql_str02);
+			
+//			res = null;
+//			//新增字段battTestTimeLong1
+//			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
+//					+ " WHERE table_schema='db_ram_db'"
+//					+ " AND table_name='tb_dev6159_power_yc'"
+//					+ " AND column_name='battTestTimeLong1'");
+//			if(!res.next()){				
+//				sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Dev6159_Power_Yc_Table 
+//						+ " ADD COLUMN `battTestTimeLong1` int(11) NOT NULL DEFAULT '0' COMMENT '电池1测试时长';");
+//			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		} finally {
+			if(null != res) {
+				try {
+					res.close();
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}
+			}
 			sql.close_con();
 		}		
 	}
@@ -457,7 +698,39 @@
 				"  `fsw2_sw3_trip` int(11) NOT NULL DEFAULT '0' COMMENT '2段直流第51-75路开关跳闸[bit0-第51路  ... bit24-第75路]-DCSWIB'," + 
 				"  `fsw2_sw4_trip` int(11) NOT NULL DEFAULT '0' COMMENT '2段直流第76-100路开关跳闸[bit0-第76路  ... bit24-第100路]-DCSWIB'," + 
 				"  `dev_total_alm_dc` tinyint(4) NOT NULL DEFAULT '0' COMMENT '直流配电柜总告警-DCSWIB'," + 
-				"  PRIMARY KEY (`num`)," + 
+			
+				"  `power_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT '通信电源状态'," + 
+				"  `acin1_thunder_switch_ac` tinyint(4) NOT NULL DEFAULT '0' COMMENT '进线1防雷器空开状态-ACSWIB'," + 
+				"  `acin2_thunder_switch_ac` tinyint(4) NOT NULL DEFAULT '0' COMMENT '进线2防雷器空开状态-ACSWIB'," + 
+				"  `batt_chardis_state_cpss` tinyint(4) NOT NULL DEFAULT '0' COMMENT '充放电状态'," + 
+				"  `k1_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'K1状态'," + 
+				"  `k2_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'k2状态'," + 
+				"  `kb_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'KB状态'," + 
+				"  `kc_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'kc状态[常开不做点位判断]'," + 
+				"  `kc1_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'kc1状态'," + 
+				"  `kd_state` tinyint(4) NOT NULL DEFAULT '1' COMMENT '常闭接触器不做点位判断'," + 
+				"  `kd1_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'kd1状态'," + 
+				"  `kd2_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'kd2状态'," + 
+				"  `k11_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'K11状态'," + 
+				"  `k12_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'K12状态'," + 
+				"  `k13_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'K13状态'," + 
+				"  `k14_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'K14状态'," + 
+				"  `k15_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'K16状态'," + 
+				"  `k16_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'K16状态'," + 
+				"  `k17_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'K17状态'," + 
+				"  `k18_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'K18状态'," + 
+				"  `batt_state` tinyint(4) NOT NULL DEFAULT '0' COMMENT '电池状态'," + 
+				"  `load_powerdown_st` int(4) NOT NULL DEFAULT '0' COMMENT '负载一次下电状态'," + 
+				"  `dk11_allow_ctl` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'DK11 是否远程控制(0-远程1-手动)'," + 
+				"  `dk12_allow_ctl` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'DK12 是否远程控制(0-远程1-手动)'," + 
+				"  `dk13_allow_ctl` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'DK13 是否远程控制(0-远程1-手动)'," + 
+				"  `dk14_allow_ctl` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'DK14 是否远程控制(0-远程1-手动)'," + 
+				"  `dk15_allow_ctl` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'DK15 是否远程控制(0-远程1-手动)'," + 
+				"  `dk16_allow_ctl` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'DK16 是否远程控制(0-远程1-手动)'," + 
+				"  `dk17_allow_ctl` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'DK17 是否远程控制(0-远程1-手动)'," + 
+				"  `dk18_allow_ctl` tinyint(4) NOT NULL DEFAULT '0' COMMENT 'DK18 是否远程控制(0-远程1-手动)',"
+				
+				+ "PRIMARY KEY (`num`)," + 
 				"  UNIQUE KEY `idx_dev_id` (`dev_id`) USING BTREE" + 
 				") ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='通信电源核容一体机遥信实时状态表';" + 
 				";";

--
Gitblit v1.9.1