111
whyclxw
2020-09-09 6acd430d19977bca04690b04d211a690cc6cef19
111
2个文件已修改
14 ■■■■ 已修改文件
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_4KW_SocketClient_Thread.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectricalSystem_MonitorServer_4KW/src/com/modbus/data/MyModbusFactory.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_4KW_SocketClient_Thread.java
@@ -73,16 +73,16 @@
                    //*************************** 更新电源实时信息******************************//*
                    
                    //Date t1 = new Date();
                    readElectrical_rt(master,ert);
                    //readMutilElectrical_rt(master,ert);
                    //readElectrical_rt(master,ert);
                    readMutilElectrical_rt(master,ert);
                    Electrical_Task_SQL.update_Electric_Rt(conn_pool, ert);
                    //System.out.println("RT:"+(new Date().getTime() - t1.getTime()));
                    
                    
                    //Date t2 = new Date();
                    //**************************** 更新电源状态信息 *****************************//*
                    readElectrical_state(master,estate);
                    //readMutilElectrical_state(master,estate);
                    //readElectrical_state(master,estate);
                    readMutilElectrical_state(master,estate);
                    Electrical_Task_SQL.update_Electric_State(conn_pool, estate);
                    //System.out.println("State:"+(new Date().getTime() - t2.getTime()));
                }
@@ -90,8 +90,8 @@
                if(runCount %4 == 0) {
                    //*************************** 读取故障状态信息 ******************************//*
                    //Date start = new Date();                    
                    //readMutilElectricalAlarmData(master,eAlarm);
                    //Electrical_Task_SQL.insertOrUpdateElectrical_alarmTable(conn_pool, listAlarm);
                    readMutilElectricalAlarmData(master,eAlarm);
                    Electrical_Task_SQL.insertOrUpdateElectrical_alarmTable(conn_pool, listAlarm);
                    //Date end = new Date();
                    //System.out.println((end.getTime()-start.getTime())/1000);
                }
ElectricalSystem_MonitorServer_4KW/src/com/modbus/data/MyModbusFactory.java
@@ -31,7 +31,7 @@
        ModbusMaster master = modbusFactory.createTcpMaster(params, true);// TCP 协议
        try {
             //设置超时时间
            master.setTimeout(1000);
            master.setTimeout(2000);
            //设置重连次数
            master.setRetries(3);
            //初始化