DELL
2024-12-19 6ab9c7858c234f51719acc3e514a1af769da578b
ElectLock_Monitor/src/com/dev/lock/comm/Lock_SocketClient_Thread.java
@@ -159,6 +159,8 @@
               mRtu_Tx.mkBusRtu(MyModBusRtu.CMD_TYPE_READ_INPUT, ElectLock_ComBase.LOCK_REAL_ADDR, ElectLock_State.Reg_Count_Real);
               if(SocketComm(mRtu_Tx, ByteBuffer.allocate(0))) {
                  Lock_Task_SQL.updateLock_Rt_Table(pool,client_id,mLock_State);
                  Lock_Task_SQL.updateLock_Inf_Table(pool,client_id,mLock_State);
               }
            }
            
@@ -171,7 +173,7 @@
      } catch (Exception e) {
         e.printStackTrace();
      } finally {
         logger.info("设备断开连接:DevIp:" + client_ip + " DevId:" + client_id);
         logger.info("设备断开连接:DevIp:" + client_ip + " DevId:" + mLock_State.getLockDevId());
      }
      if(null != tmp_socket) {
@@ -219,7 +221,7 @@
                  if(tmp_lock.getLock_ip().equals(client_ip)) {
                     ele_lock = tmp_lock;
                     mLock_State = ele_lock.lockState;
                     client_id = ele_lock.getId();
                     client_id = ele_lock.getLock_id();
                     mLock_State.setClient_ip(client_ip);
                     isCheckOk = true;
                  }
@@ -228,16 +230,16 @@
               //通过ID号识别锁具
               mRtu_Tx.mkBusRtu(MyModBusRtu.CMD_TYPE_READ_INPUT, ElectLock_ComBase.LOCK_REAL_ADDR, ElectLock_State.Reg_Count_Real);
               if(SocketComm(mRtu_Tx, ByteBuffer.allocate(0))){
                  System.out.println("mLock_State.getLock_addr():"+mLock_State.getLock_addr());
                  //System.err.println(mLock_State);
                  System.out.println("mLock_State.getLockDevId():"+mLock_State.getLockDevId());
                  
                  for(int m = 0; m < GB_Lock_Array.getIteamCount();m++) {
                     ElectLock_Inf tmp_lock = GB_Lock_Array.getIteam(m);
                     if(tmp_lock.getId() == mLock_State.getLock_addr()) {
                     if(tmp_lock.getLock_id() == mLock_State.getLockDevId()) {
                        
                        ele_lock = tmp_lock;
                        mLock_State = ele_lock.lockState;
                        client_id = ele_lock.getId();
                        client_id = ele_lock.getLock_id();
                        mLock_State.setClient_ip(client_ip);
                        isCheckOk = true;
                     }
@@ -306,7 +308,7 @@
                Date d1 = new Date();
                int rx_read_time_out = 0;
                //int rx_len = 0;
                System.out.println("数据长度" + plain_tx_t.length + "\t发送数据:" + ComFn.bytesToHexString(plain_tx_t, plain_tx_t.length));
                logger.debug("数据长度" + plain_tx_t.length + "\t发送数据:" + ComFn.bytesToHexString(plain_tx_t, plain_tx_t.length));
                out.write(plain_tx_t);
                out.flush();
               
@@ -353,7 +355,7 @@
                bytebuffer_for_socket_RX.get(cipher_buf);
                
                
                System.out.println("数据长度"+cipher_buf.length+"\t返回数据:"+ ComFn.bytesToHexString(cipher_buf, cipher_buf.length));
                logger.debug("数据长度"+cipher_buf.length+"\t返回数据:"+ ComFn.bytesToHexString(cipher_buf, cipher_buf.length));
                //Log.e(TAG, "SocketComm: "+ComFn.bytesToHexString(plain_buf, plain_buf.length));
                if(cipher_buf.length > MyModBusRtu.BYTE_LEN && true == getDataFromCommBuf(cipher_buf,rtu)) {
                   res_t = true;