修改

whyclxw

2020-09-09 ba1543fb771b897c72d377ae946b3a31480ffc2d

修改

 ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electric_Rt.java

@@ -82,11 +82,11 @@
        batch.addLocator(22,MyModbusUtils.createBaseLocator(Electric_4KW_ModbusAddress.getAddress(this.electric_id, "switchoff_1"), master));                                //1号开关    
        batch.addLocator(23,MyModbusUtils.createBaseLocator(Electric_4KW_ModbusAddress.getAddress(this.electric_id, "switchoff_2"), master));                                //2号开关    
            
        batch.addLocator(24,MyModbusUtils.createBaseLocator(Electric_4KW_ModbusAddress.getAddress(this.electric_id, "comm_state"), master));                                 //ͨѶ״̬
        /*batch.addLocator(24,MyModbusUtils.createBaseLocator(Electric_4KW_ModbusAddress.getAddress(this.electric_id, "comm_state"), master));                                 //ͨѶ״̬
        batch.addLocator(25,MyModbusUtils.createBaseLocator(Electric_4KW_ModbusAddress.getAddress(this.electric_id, "screen_reset"), master));                                 //触摸屏状态    
        batch.addLocator(26,MyModbusUtils.createBaseLocator(Electric_4KW_ModbusAddress.getAddress(this.electric_id, "fan_control"), master));                                 //风机控制    
        batch.addLocator(27,MyModbusUtils.createBaseLocator(Electric_4KW_ModbusAddress.getAddress(this.electric_id, "emergency_trip"), master));                            //总控柜紧急跳闸
	
    */
        return batch;
    }
    
@@ -124,11 +124,11 @@
            this.switchoff_1 = MyModbusUtils.readBooleanToInt(res.getValue(22)); //1号开关    
            this.switchoff_2 = MyModbusUtils.readBooleanToInt(res.getValue(23)); //2号开关    
            
            this.comm_state=MyModbusUtils.readBooleanToInt(res.getValue(24)); //ͨѶ״̬
            /*this.comm_state=MyModbusUtils.readBooleanToInt(res.getValue(24)); //ͨѶ״̬
            this.screen_reset=MyModbusUtils.readBooleanToInt(res.getValue(25)); //触摸屏状态    
            this.fan_control=MyModbusUtils.readBooleanToInt(res.getValue(26)); //风机控制    
            this.emergency_trip=MyModbusUtils.readBooleanToInt(res.getValue(27)); //总控柜紧急跳闸
        }
*/        }
    }
    
    public Electric_Rt(int electric_id) {

 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,13 +90,13 @@
                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);
                }
                
                System.err.println(einf.electric_id+"====="+((new Date()).getTime()-last.getTime()));
                //System.err.println(einf.electric_id+"====="+((new Date()).getTime()-last.getTime()));
                last = new Date();
                
                //判断当前设备是否断开连接

 ElectricalSystem_MonitorServer_4KW/src/com/modbus/data/MyModbusFactory.java

@@ -31,7 +31,7 @@
        ModbusMaster master = modbusFactory.createTcpMaster(params, true);// TCP 协议

        try {

             //设置超时时间

            master.setTimeout(100);

            master.setTimeout(1000);
            //设置重连次数

            master.setRetries(3);

            //初始化