diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java index d83d535..89f8d51 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java @@ -96,31 +96,38 @@ log.info("Available port as follows " + JSON.toJSONString(allPorts)); if (!allPorts.isEmpty()) { serialPort = new NRSerialPort(serialPortName, Constant.BAUD_RATE); - serialPort.connect(); try { - serialPort.addEventListener(serialPortEvent -> { - // 解决数据断行 + if (serialPort.connect()) { try { - Thread.sleep(500); - } catch (InterruptedException e) { + serialPort.addEventListener(serialPortEvent -> { + // 解决数据断行 + try { + Thread.sleep(500); + } catch (InterruptedException e) { + e.printStackTrace(); + } + if (serialPortEvent.getEventType() == SerialPortEvent.DATA_AVAILABLE) { + analyzeData(SerialPortManager.readFromPort(serialPort)); + } else { + log.info("The serial port status is abnormal"); + serialPort.removeEventListener(); + } + serialPort.notifyOnDataAvailable(true); + }); + } catch (TooManyListenersException e) { e.printStackTrace(); } - if (serialPortEvent.getEventType() == SerialPortEvent.DATA_AVAILABLE) { - analyzeData(SerialPortManager.readFromPort(serialPort)); + if (isClient) { + SerialPortManager.setupSerialPortConfig(serialPort, SerialPortManager.CLIENT_CMD); } else { - log.info("The serial port status is abnormal"); - serialPort.removeEventListener(); + SerialPortManager.setupSerialPortConfig(serialPort, SerialPortManager.SERVER_CMD); } - serialPort.notifyOnDataAvailable(true); - }); - } catch (TooManyListenersException e) { + } else { + sendToSocket("No Available TT Port"); + } + } catch (Exception e) { e.printStackTrace(); } - if (isClient) { - SerialPortManager.setupSerialPortConfig(serialPort, SerialPortManager.CLIENT_CMD); - } else { - SerialPortManager.setupSerialPortConfig(serialPort, SerialPortManager.SERVER_CMD); - } } } diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java index d83d535..89f8d51 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java @@ -96,31 +96,38 @@ log.info("Available port as follows " + JSON.toJSONString(allPorts)); if (!allPorts.isEmpty()) { serialPort = new NRSerialPort(serialPortName, Constant.BAUD_RATE); - serialPort.connect(); try { - serialPort.addEventListener(serialPortEvent -> { - // 解决数据断行 + if (serialPort.connect()) { try { - Thread.sleep(500); - } catch (InterruptedException e) { + serialPort.addEventListener(serialPortEvent -> { + // 解决数据断行 + try { + Thread.sleep(500); + } catch (InterruptedException e) { + e.printStackTrace(); + } + if (serialPortEvent.getEventType() == SerialPortEvent.DATA_AVAILABLE) { + analyzeData(SerialPortManager.readFromPort(serialPort)); + } else { + log.info("The serial port status is abnormal"); + serialPort.removeEventListener(); + } + serialPort.notifyOnDataAvailable(true); + }); + } catch (TooManyListenersException e) { e.printStackTrace(); } - if (serialPortEvent.getEventType() == SerialPortEvent.DATA_AVAILABLE) { - analyzeData(SerialPortManager.readFromPort(serialPort)); + if (isClient) { + SerialPortManager.setupSerialPortConfig(serialPort, SerialPortManager.CLIENT_CMD); } else { - log.info("The serial port status is abnormal"); - serialPort.removeEventListener(); + SerialPortManager.setupSerialPortConfig(serialPort, SerialPortManager.SERVER_CMD); } - serialPort.notifyOnDataAvailable(true); - }); - } catch (TooManyListenersException e) { + } else { + sendToSocket("No Available TT Port"); + } + } catch (Exception e) { e.printStackTrace(); } - if (isClient) { - SerialPortManager.setupSerialPortConfig(serialPort, SerialPortManager.CLIENT_CMD); - } else { - SerialPortManager.setupSerialPortConfig(serialPort, SerialPortManager.SERVER_CMD); - } } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 935f141..35c0a8e 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -29,8 +29,8 @@ port: 12208 serialPort: - name: /dev/tty.usbserial-1130 - isClient: false + name: /dev/tty.usbserial-FTAQ6T45 + isClient: true serverAccount: CC0Z06 serverPassword: 11 clientAccount: TT0Z07