whyclxw
2020-12-29 1f73540edbda5eca9da22ecd84bf134bd5523203
修改
1个文件已添加
3个文件已修改
54 ■■■■■ 已修改文件
Rectifier_power_4MW/Rectifier_power_4MW_logs/info-20201228-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
Rectifier_power_4MW/Rectifier_power_4MW_logs/info.log 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Rectifier_power_4MW/src/com/data/Rectifier_power.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Rectifier_power_4MW/src/com/data/comm/Rectifier_power_RealRecord_Thread.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Rectifier_power_4MW/Rectifier_power_4MW_logs/info-20201228-1.log.gz
Binary files differ
Rectifier_power_4MW/Rectifier_power_4MW_logs/info.log
@@ -1,7 +1,21 @@
2020-12-28 16:22:17.457 [main] [INFO] main.main_Rectifier_power - main_Rectifier_power Server Started At DateTime: 2020-12-28 16:22:17     VWelcome To Use main_Rectifier_power V1.101
2020-12-28 16:22:17.483 [main] [INFO] main.main_Rectifier_power - SQLserver IP: 192.168.10.221, port: 3360
2020-12-28 16:22:17.483 [main] [INFO] main.main_Rectifier_power - IP:192.168.10.221     port:3360
2020-12-28 16:22:17.710 [main] [INFO] main.main_Rectifier_power -  开始检测数据库连接 2020-12-28 16:22:17
2020-12-28 16:22:17.907 [main] [INFO] main.main_Rectifier_power - 检测数据库连接成功
2020-12-28 16:22:17.971 [Thread-12] [INFO] com.data.comm.Rectifier_power_RealRecord_Thread -  Rectifier_power_RealRecord_Thread Start ...
2020-12-28 16:22:17.971 [Thread-11] [TRACE] com.data.comm.Rectifier_power_SocketServer_Thread -  Rectifier_power_SocketServer_Thread Start at 2020-12-28 16:22:17
2020-12-29 15:23:13.843 [main] [INFO] main.main_Rectifier_power - main_Rectifier_power Server Started At DateTime: 2020-12-29 15:23:13     VWelcome To Use main_Rectifier_power V1.101
2020-12-29 15:23:13.975 [main] [INFO] main.main_Rectifier_power - SQLserver IP: 192.168.10.221, port: 3360
2020-12-29 15:23:13.976 [main] [INFO] main.main_Rectifier_power - IP:192.168.10.221     port:3360
2020-12-29 15:23:14.372 [main] [INFO] main.main_Rectifier_power -  开始检测数据库连接 2020-12-29 15:23:14
2020-12-29 15:23:14.614 [main] [INFO] main.main_Rectifier_power - 检测数据库连接成功
2020-12-29 15:23:14.767 [Thread-12] [INFO] com.data.comm.Rectifier_power_RealRecord_Thread -  Rectifier_power_RealRecord_Thread Start ...
2020-12-29 15:23:14.768 [Thread-11] [TRACE] com.data.comm.Rectifier_power_SocketServer_Thread -  Rectifier_power_SocketServer_Thread Start at 2020-12-29 15:23:14
2020-12-29 15:26:15.376 [main] [INFO] main.main_Rectifier_power - main_Rectifier_power Server Started At DateTime: 2020-12-29 15:26:15     VWelcome To Use main_Rectifier_power V1.101
2020-12-29 15:26:15.402 [main] [INFO] main.main_Rectifier_power - SQLserver IP: 192.168.10.221, port: 3360
2020-12-29 15:26:15.402 [main] [INFO] main.main_Rectifier_power - IP:192.168.10.221     port:3360
2020-12-29 15:26:15.627 [main] [INFO] main.main_Rectifier_power -  开始检测数据库连接 2020-12-29 15:26:15
2020-12-29 15:26:15.832 [main] [INFO] main.main_Rectifier_power - 检测数据库连接成功
2020-12-29 15:26:15.915 [Thread-12] [INFO] com.data.comm.Rectifier_power_RealRecord_Thread -  Rectifier_power_RealRecord_Thread Start ...
2020-12-29 15:26:15.915 [Thread-11] [TRACE] com.data.comm.Rectifier_power_SocketServer_Thread -  Rectifier_power_SocketServer_Thread Start at 2020-12-29 15:26:15
2020-12-29 15:28:08.602 [main] [INFO] main.main_Rectifier_power - main_Rectifier_power Server Started At DateTime: 2020-12-29 15:28:08     VWelcome To Use main_Rectifier_power V1.101
2020-12-29 15:28:08.629 [main] [INFO] main.main_Rectifier_power - SQLserver IP: 192.168.10.221, port: 3360
2020-12-29 15:28:08.629 [main] [INFO] main.main_Rectifier_power - IP:192.168.10.221     port:3360
2020-12-29 15:28:08.863 [main] [INFO] main.main_Rectifier_power -  开始检测数据库连接 2020-12-29 15:28:08
2020-12-29 15:28:09.076 [main] [INFO] main.main_Rectifier_power - 检测数据库连接成功
2020-12-29 15:28:09.158 [Thread-12] [INFO] com.data.comm.Rectifier_power_RealRecord_Thread -  Rectifier_power_RealRecord_Thread Start ...
2020-12-29 15:28:09.158 [Thread-11] [TRACE] com.data.comm.Rectifier_power_SocketServer_Thread -  Rectifier_power_SocketServer_Thread Start at 2020-12-29 15:28:09
Rectifier_power_4MW/src/com/data/Rectifier_power.java
@@ -132,17 +132,17 @@
    
    public BatchRead<Integer> createBatchRead(MyModbusMaster master) {
        BatchRead<Integer> batch = new BatchRead<Integer>();        
        batch.addLocator(0,MyModbusUtils.createInputLocator(1,master));        //'10kv开关合闸信号',
        batch.addLocator(1,MyModbusUtils.createInputLocator(2,master));        //'10kv开关分闸信号'
        batch.addLocator(2,MyModbusUtils.createInputLocator(3, master));    //'10KV高压开关允许合闸信号',
        batch.addLocator(3,MyModbusUtils.createInputLocator(4,master));        //'整流器故障跳闸信号',
        batch.addLocator(4,MyModbusUtils.createInputLocator(5,master));        //'大功率整流电源运行/停止状态信号',
        batch.addLocator(5,MyModbusUtils.createInputLocator(6,master));        //'大功率整流电源故障状态信号',
        batch.addLocator(0,MyModbusUtils.createBaseLocator(1,master));        //'10kv开关合闸信号',
        batch.addLocator(1,MyModbusUtils.createBaseLocator(2,master));        //'10kv开关分闸信号'
        batch.addLocator(2,MyModbusUtils.createBaseLocator(3, master));    //'10KV高压开关允许合闸信号',
        batch.addLocator(3,MyModbusUtils.createBaseLocator(4,master));        //'整流器故障跳闸信号',
        batch.addLocator(4,MyModbusUtils.createBaseLocator(5,master));        //'大功率整流电源运行/停止状态信号',
        batch.addLocator(5,MyModbusUtils.createBaseLocator(6,master));        //'大功率整流电源故障状态信号',
        batch.addLocator(6,MyModbusUtils.createBaseLocator(7,DataType.TWO_BYTE_INT_SIGNED,master));        //'大功率整流电源电压信号',                    
        batch.addLocator(7,MyModbusUtils.createBaseLocator(8,DataType.TWO_BYTE_INT_SIGNED,master));    //'大功率整流电源电流信号',                            
        batch.addLocator(8,MyModbusUtils.createInputLocator(9, master));    //'工艺、综控远方停止大功率整流器',
        batch.addLocator(9,MyModbusUtils.createInputLocator(10,master));    //'工艺、综控远方紧急停止大功率整流器',
        batch.addLocator(10,MyModbusUtils.createInputLocator(11,master));    //'通讯信号',
        batch.addLocator(8,MyModbusUtils.createBaseLocator(9, master));    //'工艺、综控远方停止大功率整流器',
        batch.addLocator(9,MyModbusUtils.createBaseLocator(10,master));    //'工艺、综控远方紧急停止大功率整流器',
        batch.addLocator(10,MyModbusUtils.createBaseLocator(11,master));    //'通讯信号',
        
        
        
@@ -157,8 +157,8 @@
            rectifier_falut = MyModbusUtils.readBooleanToInt(res.getValue(3));            //'整流器故障跳闸信号',
            rectifier_power_state = MyModbusUtils.readBooleanToInt(res.getValue(4));            //'大功率整流电源运行/停止状态信号',
            rectifier_alarm = MyModbusUtils.readBooleanToInt(res.getValue(5));            //'大功率整流电源故障状态信号',
            rectifier_vol = MyModbusUtils.readBooleanToInt(res.getValue(6));        //'大功率整流电源电压信号',
            rectifier_curr = MyModbusUtils.readBooleanToInt(res.getValue(7));            //'大功率整流电源电流信号',
            rectifier_vol = MyModbusUtils.readShortToFloat(res.getValue(6));        //'大功率整流电源电压信号',
            rectifier_curr = MyModbusUtils.readShortToFloat(res.getValue(7));            //'大功率整流电源电流信号',
            remote_stop = MyModbusUtils.readBooleanToInt(res.getValue(8));        //'工艺、综控远方停止大功率整流器',
            emergency_stop = MyModbusUtils.readBooleanToInt(res.getValue(9));    //'工艺、综控远方紧急停止大功率整流器',
            com_signal = MyModbusUtils.readBooleanToInt(res.getValue(10));        //'通讯信号',
Rectifier_power_4MW/src/com/data/comm/Rectifier_power_RealRecord_Thread.java
@@ -73,10 +73,10 @@
                try {
                    now = new Date();
                    Thread.sleep(100);
                    /*if(motor_inf.conn_state == 0) {
                    if(motor_inf.conn_state == 0) {
                        //通讯中断
                        continue;
                    }*/
                    }
                    if(now.getTime()-last.getTime() >= TESTDATA_RECORD_INTERVAL*1000) {
                        Rectifier_power_SQL.insertTb_rectifier_power_RealData(pool, motor_inf.rPower, now);
                        last = now;