whyclj
2020-09-24 2b64a566f77f90fe47f62863b7a185b6e1c514b7
WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
@@ -36,6 +36,7 @@
      wbrach = new Water_brach(winf.getWater_id());
      walarm =new Water_alarm(winf.water_id);
      master = new MyModbusMaster(winf.getWater_ip(), MyModbusMaster.SLAVEID_DEFAULT);
      //System.out.println(master);
   }
      
@@ -68,9 +69,11 @@
            if(runCount %4 == 0) {
               //*************************** 读取水冷信息故障 ******************************//*
               //readWaterAlarmData(master,walarm);
               readMutilWaterAlarmData(master, walarm);
               Water_Task_SQL.insertOrUpdateWater_alarmTable(conn_pool, listAlarm);
               //readMutilWaterAlarmData(master, walarm);
               //Water_Task_SQL.insertOrUpdateWater_alarmTable(conn_pool, listAlarm);
            }
            Water_Task_SQL.insertOrUpdateDeviceConnectState(conn_pool, winf.water_id, master);
            
            if(runCount%10 == 0) {
               //更新当前设备ip
@@ -541,7 +544,7 @@
    * @param dbutton
    */
   public void readMutilWater_rt(MyModbusMaster master, Water_rt wrt) {
      BatchRead<Integer> batch = wrt.createBatchRead(master);
      BatchRead<Integer> batch = wrt.createBatchRead(master);
      BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
      wrt.putBatchResult(res);
   }