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 fd58b6a..60199bb 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 @@ -73,16 +73,16 @@ * 指挥机发送指令 * *AT^IOTDATA=31,"^$CC0Z06,11,SEND,TT0Z07, 1234$^" */ - public static byte[] createServerMessageCmd(String data, String targetName, String clientName) { + public static byte[] createServerMessageCmd(String data, String serverAccount, String pwd, String clientAccount) { byte[] bytes = data.getBytes(StandardCharsets.UTF_8); byte[] encrypt = TEA.encrypt(bytes); String dataHex = ByteUtils.bytesToHexString(encrypt); - int dataLength = 2 + targetName.length() + 9 + clientName.length() + 2 + dataHex.length() + 2; + int dataLength = 2 + serverAccount.length() + 9 + clientAccount.length() + 2 + dataHex.length() + 2; String cmd = "*AT^IOTDATA=" + dataLength - + ",\"^$" + targetName - + ",11,SEND," + clientName - + ", " + + ",\"^$" + serverAccount + "," + + pwd + ",SEND," + + clientAccount + ", " + dataHex + "$^\""; log.info(cmd); 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 fd58b6a..60199bb 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 @@ -73,16 +73,16 @@ * 指挥机发送指令 * *AT^IOTDATA=31,"^$CC0Z06,11,SEND,TT0Z07, 1234$^" */ - public static byte[] createServerMessageCmd(String data, String targetName, String clientName) { + public static byte[] createServerMessageCmd(String data, String serverAccount, String pwd, String clientAccount) { byte[] bytes = data.getBytes(StandardCharsets.UTF_8); byte[] encrypt = TEA.encrypt(bytes); String dataHex = ByteUtils.bytesToHexString(encrypt); - int dataLength = 2 + targetName.length() + 9 + clientName.length() + 2 + dataHex.length() + 2; + int dataLength = 2 + serverAccount.length() + 9 + clientAccount.length() + 2 + dataHex.length() + 2; String cmd = "*AT^IOTDATA=" + dataLength - + ",\"^$" + targetName - + ",11,SEND," + clientName - + ", " + + ",\"^$" + serverAccount + "," + + pwd + ",SEND," + + clientAccount + ", " + dataHex + "$^\""; log.info(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 35d3d57..d83d535 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 @@ -38,11 +38,36 @@ private final ILogService logService; private final ISatelliteService satelliteService; + /** + * 硬件端口名 + */ @Value("${casic.serialPort.name}") private String serialPortName; + + /** + * 指挥机还是客户终端 + */ @Value("${casic.serialPort.isClient}") private boolean isClient; + /** + * 指挥机帐号 + */ + @Value("${casic.serialPort.serverAccount}") + private String serverAccount; + + /** + * 指挥机帐号 + */ + @Value("${casic.serialPort.serverPassword}") + private String serverPassword; + + /** + * 客户端帐号 + */ + @Value("${casic.serialPort.clientAccount}") + private String clientAccount; + private NRSerialPort serialPort; private ChannelHandlerContext channelHandler; @@ -328,7 +353,9 @@ if (isClient) { bytes = CommandManager.createClientMessageCmd(decodeSMS); } else { - bytes = CommandManager.createServerMessageCmd(decodeSMS, "CC0Z06", "TT0Z07"); + bytes = CommandManager.createServerMessageCmd( + decodeSMS, serverAccount, serverPassword, clientAccount + ); } } if (serialPort != null && serialPort.isConnected()) { 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 fd58b6a..60199bb 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 @@ -73,16 +73,16 @@ * 指挥机发送指令 * *AT^IOTDATA=31,"^$CC0Z06,11,SEND,TT0Z07, 1234$^" */ - public static byte[] createServerMessageCmd(String data, String targetName, String clientName) { + public static byte[] createServerMessageCmd(String data, String serverAccount, String pwd, String clientAccount) { byte[] bytes = data.getBytes(StandardCharsets.UTF_8); byte[] encrypt = TEA.encrypt(bytes); String dataHex = ByteUtils.bytesToHexString(encrypt); - int dataLength = 2 + targetName.length() + 9 + clientName.length() + 2 + dataHex.length() + 2; + int dataLength = 2 + serverAccount.length() + 9 + clientAccount.length() + 2 + dataHex.length() + 2; String cmd = "*AT^IOTDATA=" + dataLength - + ",\"^$" + targetName - + ",11,SEND," + clientName - + ", " + + ",\"^$" + serverAccount + "," + + pwd + ",SEND," + + clientAccount + ", " + dataHex + "$^\""; log.info(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 35d3d57..d83d535 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 @@ -38,11 +38,36 @@ private final ILogService logService; private final ISatelliteService satelliteService; + /** + * 硬件端口名 + */ @Value("${casic.serialPort.name}") private String serialPortName; + + /** + * 指挥机还是客户终端 + */ @Value("${casic.serialPort.isClient}") private boolean isClient; + /** + * 指挥机帐号 + */ + @Value("${casic.serialPort.serverAccount}") + private String serverAccount; + + /** + * 指挥机帐号 + */ + @Value("${casic.serialPort.serverPassword}") + private String serverPassword; + + /** + * 客户端帐号 + */ + @Value("${casic.serialPort.clientAccount}") + private String clientAccount; + private NRSerialPort serialPort; private ChannelHandlerContext channelHandler; @@ -328,7 +353,9 @@ if (isClient) { bytes = CommandManager.createClientMessageCmd(decodeSMS); } else { - bytes = CommandManager.createServerMessageCmd(decodeSMS, "CC0Z06", "TT0Z07"); + bytes = CommandManager.createServerMessageCmd( + decodeSMS, serverAccount, serverPassword, clientAccount + ); } } if (serialPort != null && serialPort.isConnected()) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 6f7a330..935f141 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -8,7 +8,7 @@ username: root password: Casic203 jms: - pub-sub-domain: true + pub-sub-domain: true # session: # store-type: redis # redis: @@ -31,6 +31,9 @@ serialPort: name: /dev/tty.usbserial-1130 isClient: false + serverAccount: CC0Z06 + serverPassword: 11 + clientAccount: TT0Z07 logging: level.root: info level.com.casic: debug