diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java index 9396713..cd8e0da 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java @@ -11,6 +11,7 @@ */ @Slf4j public class CommandManager { + public static final String CMD_CLOSE_DEBUG = "*XF,DEBUG=0"; public static final String CMD_WORK_MODE = "*W:DEV:S"; public static final String CMD_CENTER_NUMBER = "*W:SCA:8617400010200"; diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java index 9396713..cd8e0da 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java @@ -11,6 +11,7 @@ */ @Slf4j public class CommandManager { + public static final String CMD_CLOSE_DEBUG = "*XF,DEBUG=0"; public static final String CMD_WORK_MODE = "*W:DEV:S"; public static final String CMD_CENTER_NUMBER = "*W:SCA:8617400010200"; diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java index 90ee4a8..ff317be 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java @@ -16,6 +16,8 @@ @Slf4j public class SerialPortManager { private static final List CMD = Arrays.asList( + /*设置天天通北斗关闭Debug模式*/ + CommandManager.CMD_CLOSE_DEBUG.getBytes(StandardCharsets.UTF_8), /*设置天天通北斗终端天线工作模式*/ CommandManager.CMD_WORK_MODE.getBytes(StandardCharsets.UTF_8), /*设置短信发送目的地的号码数量*/ @@ -35,26 +37,6 @@ e.printStackTrace(); } } -// SerialPortManager.sendToPort(serialPort, CommandManager.CMD_WORK_MODE.getBytes(StandardCharsets.UTF_8)); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -// SerialPortManager.sendToPort(serialPort, CommandManager.createTargetNumberCmd( -// new String[]{"8617400542542", "8618765997865"} -// )); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -// SerialPortManager.sendToPort(serialPort, CommandManager.CMD_CENTER_NUMBER.getBytes(StandardCharsets.UTF_8)); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } } /** diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java index 9396713..cd8e0da 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java @@ -11,6 +11,7 @@ */ @Slf4j public class CommandManager { + public static final String CMD_CLOSE_DEBUG = "*XF,DEBUG=0"; public static final String CMD_WORK_MODE = "*W:DEV:S"; public static final String CMD_CENTER_NUMBER = "*W:SCA:8617400010200"; diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java index 90ee4a8..ff317be 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java @@ -16,6 +16,8 @@ @Slf4j public class SerialPortManager { private static final List CMD = Arrays.asList( + /*设置天天通北斗关闭Debug模式*/ + CommandManager.CMD_CLOSE_DEBUG.getBytes(StandardCharsets.UTF_8), /*设置天天通北斗终端天线工作模式*/ CommandManager.CMD_WORK_MODE.getBytes(StandardCharsets.UTF_8), /*设置短信发送目的地的号码数量*/ @@ -35,26 +37,6 @@ e.printStackTrace(); } } -// SerialPortManager.sendToPort(serialPort, CommandManager.CMD_WORK_MODE.getBytes(StandardCharsets.UTF_8)); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -// SerialPortManager.sendToPort(serialPort, CommandManager.createTargetNumberCmd( -// new String[]{"8617400542542", "8618765997865"} -// )); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -// SerialPortManager.sendToPort(serialPort, CommandManager.CMD_CENTER_NUMBER.getBytes(StandardCharsets.UTF_8)); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } } /** diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java b/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java index ff1a2aa..4997a7f 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java @@ -41,7 +41,7 @@ ctx.channel().read(); InetSocketAddress socketAddress = (InetSocketAddress) ctx.channel().remoteAddress(); String ip = socketAddress.getAddress().getHostAddress(); - socketService.onSocketConnected(); + socketService.onSocketConnected(ctx); log.info("channelActive ===> " + ip); } diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java index 9396713..cd8e0da 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java @@ -11,6 +11,7 @@ */ @Slf4j public class CommandManager { + public static final String CMD_CLOSE_DEBUG = "*XF,DEBUG=0"; public static final String CMD_WORK_MODE = "*W:DEV:S"; public static final String CMD_CENTER_NUMBER = "*W:SCA:8617400010200"; diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java index 90ee4a8..ff317be 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java @@ -16,6 +16,8 @@ @Slf4j public class SerialPortManager { private static final List CMD = Arrays.asList( + /*设置天天通北斗关闭Debug模式*/ + CommandManager.CMD_CLOSE_DEBUG.getBytes(StandardCharsets.UTF_8), /*设置天天通北斗终端天线工作模式*/ CommandManager.CMD_WORK_MODE.getBytes(StandardCharsets.UTF_8), /*设置短信发送目的地的号码数量*/ @@ -35,26 +37,6 @@ e.printStackTrace(); } } -// SerialPortManager.sendToPort(serialPort, CommandManager.CMD_WORK_MODE.getBytes(StandardCharsets.UTF_8)); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -// SerialPortManager.sendToPort(serialPort, CommandManager.createTargetNumberCmd( -// new String[]{"8617400542542", "8618765997865"} -// )); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -// SerialPortManager.sendToPort(serialPort, CommandManager.CMD_CENTER_NUMBER.getBytes(StandardCharsets.UTF_8)); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } } /** diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java b/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java index ff1a2aa..4997a7f 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java @@ -41,7 +41,7 @@ ctx.channel().read(); InetSocketAddress socketAddress = (InetSocketAddress) ctx.channel().remoteAddress(); String ip = socketAddress.getAddress().getHostAddress(); - socketService.onSocketConnected(); + socketService.onSocketConnected(ctx); log.info("channelActive ===> " + ip); } diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/service/ISocketService.java b/casic-shelter/src/main/java/com/casic/missiles/socket/service/ISocketService.java index 88ac91c..2397c28 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/service/ISocketService.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/service/ISocketService.java @@ -16,8 +16,10 @@ /** * Socket连接 + * + * @param ctx 通道上下文 */ - void onSocketConnected(); + void onSocketConnected(ChannelHandlerContext ctx); /** * Socket断开 diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java index 9396713..cd8e0da 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/CommandManager.java @@ -11,6 +11,7 @@ */ @Slf4j public class CommandManager { + public static final String CMD_CLOSE_DEBUG = "*XF,DEBUG=0"; public static final String CMD_WORK_MODE = "*W:DEV:S"; public static final String CMD_CENTER_NUMBER = "*W:SCA:8617400010200"; diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java index 90ee4a8..ff317be 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/SerialPortManager.java @@ -16,6 +16,8 @@ @Slf4j public class SerialPortManager { private static final List CMD = Arrays.asList( + /*设置天天通北斗关闭Debug模式*/ + CommandManager.CMD_CLOSE_DEBUG.getBytes(StandardCharsets.UTF_8), /*设置天天通北斗终端天线工作模式*/ CommandManager.CMD_WORK_MODE.getBytes(StandardCharsets.UTF_8), /*设置短信发送目的地的号码数量*/ @@ -35,26 +37,6 @@ e.printStackTrace(); } } -// SerialPortManager.sendToPort(serialPort, CommandManager.CMD_WORK_MODE.getBytes(StandardCharsets.UTF_8)); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -// SerialPortManager.sendToPort(serialPort, CommandManager.createTargetNumberCmd( -// new String[]{"8617400542542", "8618765997865"} -// )); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -// SerialPortManager.sendToPort(serialPort, CommandManager.CMD_CENTER_NUMBER.getBytes(StandardCharsets.UTF_8)); -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } } /** diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java b/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java index ff1a2aa..4997a7f 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/ChannelHandlerAdapter.java @@ -41,7 +41,7 @@ ctx.channel().read(); InetSocketAddress socketAddress = (InetSocketAddress) ctx.channel().remoteAddress(); String ip = socketAddress.getAddress().getHostAddress(); - socketService.onSocketConnected(); + socketService.onSocketConnected(ctx); log.info("channelActive ===> " + ip); } diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/service/ISocketService.java b/casic-shelter/src/main/java/com/casic/missiles/socket/service/ISocketService.java index 88ac91c..2397c28 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/service/ISocketService.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/service/ISocketService.java @@ -16,8 +16,10 @@ /** * Socket连接 + * + * @param ctx 通道上下文 */ - void onSocketConnected(); + void onSocketConnected(ChannelHandlerContext ctx); /** * Socket断开 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 35c3b7c..81db13c 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 @@ -58,7 +58,8 @@ } @Override - public void onSocketConnected() { + public void onSocketConnected(ChannelHandlerContext ctx) { + this.channelHandler = ctx; //初始化串口 Set allPorts = NRSerialPort.getAvailableSerialPorts(); if (!allPorts.isEmpty()) { @@ -99,14 +100,14 @@ } private void analyzeData(byte[] data) { - log.info("串口收到数据 ===> " + Arrays.toString(data)); + log.info("串口收到数据 <=== " + Arrays.toString(data)); if (-91 == data[0] && 90 == data[1]) { int[] unsignedData = ByteUtils.bytesToUnsigned(data); int type = unsignedData[3]; switch (type) { case 0x01: //读取北斗/GPS位置信息 - + sendToSocket("GPS,V"); break; case 0x02: //数据接收 @@ -172,7 +173,6 @@ */ @Override public void communicate(ChannelHandlerContext ctx, Object msg) { - this.channelHandler = ctx; byte[] data = (byte[]) msg; log.info("channelRead message ===> " + Arrays.toString(data)); /** @@ -285,6 +285,7 @@ * 方舱通过Socket发送短信给203后台,然后203后台将短信内容加密之后用卫星发送给203自己的岸基软件,然后解密之后再传给西工大岸基软件 * */ String decodeSMS = DecodeData.decodeSMS(data); + log.info(decodeSMS); operationLog.setMessage(decodeSMS); byte[] bytes; @@ -383,6 +384,6 @@ break; } } - logService.save(operationLog); +// logService.save(operationLog); } }