diff --git a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java index 14bcb82..1987ff2 100644 --- a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java +++ b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java @@ -25,12 +25,12 @@ /** * 硬件端口名 */ - @Value("${casic.serialPort.meteorology.name}") + @Value("${casic.meteorology.name}") private String serialPortName; /** * 硬件端口号 */ - @Value("${casic.serialPort.meteorology.port}") + @Value("${casic.meteorology.port}") private Integer serialPortNumber; private NRSerialPort serialPort; @@ -53,7 +53,7 @@ @Override public void run(String... args) { Set allPorts = NRSerialPort.getAvailableSerialPorts(); - log.info("Available port as follows " + JSON.toJSONString(allPorts)); + log.info("Available meteorology port as follows " + JSON.toJSONString(allPorts)); if (!allPorts.isEmpty()) { serialPort = new NRSerialPort(serialPortName, serialPortNumber); try { diff --git a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java index 14bcb82..1987ff2 100644 --- a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java +++ b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java @@ -25,12 +25,12 @@ /** * 硬件端口名 */ - @Value("${casic.serialPort.meteorology.name}") + @Value("${casic.meteorology.name}") private String serialPortName; /** * 硬件端口号 */ - @Value("${casic.serialPort.meteorology.port}") + @Value("${casic.meteorology.port}") private Integer serialPortNumber; private NRSerialPort serialPort; @@ -53,7 +53,7 @@ @Override public void run(String... args) { Set allPorts = NRSerialPort.getAvailableSerialPorts(); - log.info("Available port as follows " + JSON.toJSONString(allPorts)); + log.info("Available meteorology port as follows " + JSON.toJSONString(allPorts)); if (!allPorts.isEmpty()) { serialPort = new NRSerialPort(serialPortName, serialPortNumber); try { 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 7c64d4c..d5f76ff 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 @@ -15,7 +15,7 @@ public static final String CMD_DTU_MODE = "*XF,MODE=1,#"; public static final String CMD_WORK_MODE = "*W:DEV:S"; public static final String CMD_CENTER_NUMBER = "*W:SCA:8617400010200"; - public static final String CMD_CLIENT_NUMBER = "*W:SN:TT0Z07"; + public static final String CMD_CLIENT_NUMBER = "*W:SN:TT0Z06"; public static final String CMD_SERVER_NUMBER = "*W:SN:C"; private static final String CMD_SIGNAL = "*XF,S5,#"; @@ -85,7 +85,7 @@ + clientAccount + ", " + dataHex + "$^\""; - log.info(cmd); + log.info("Server send cmd ===> " + cmd); return cmd.getBytes(StandardCharsets.UTF_8); } } diff --git a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java index 14bcb82..1987ff2 100644 --- a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java +++ b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java @@ -25,12 +25,12 @@ /** * 硬件端口名 */ - @Value("${casic.serialPort.meteorology.name}") + @Value("${casic.meteorology.name}") private String serialPortName; /** * 硬件端口号 */ - @Value("${casic.serialPort.meteorology.port}") + @Value("${casic.meteorology.port}") private Integer serialPortNumber; private NRSerialPort serialPort; @@ -53,7 +53,7 @@ @Override public void run(String... args) { Set allPorts = NRSerialPort.getAvailableSerialPorts(); - log.info("Available port as follows " + JSON.toJSONString(allPorts)); + log.info("Available meteorology port as follows " + JSON.toJSONString(allPorts)); if (!allPorts.isEmpty()) { serialPort = new NRSerialPort(serialPortName, serialPortNumber); try { 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 7c64d4c..d5f76ff 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 @@ -15,7 +15,7 @@ public static final String CMD_DTU_MODE = "*XF,MODE=1,#"; public static final String CMD_WORK_MODE = "*W:DEV:S"; public static final String CMD_CENTER_NUMBER = "*W:SCA:8617400010200"; - public static final String CMD_CLIENT_NUMBER = "*W:SN:TT0Z07"; + public static final String CMD_CLIENT_NUMBER = "*W:SN:TT0Z06"; public static final String CMD_SERVER_NUMBER = "*W:SN:C"; private static final String CMD_SIGNAL = "*XF,S5,#"; @@ -85,7 +85,7 @@ + clientAccount + ", " + dataHex + "$^\""; - log.info(cmd); + log.info("Server send cmd ===> " + cmd); return cmd.getBytes(StandardCharsets.UTF_8); } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index d6bf295..5d83977 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -30,7 +30,7 @@ serialPort: #天通串口名,Windows下以COM开头,Linux和MacOS下串口名如下所示 - name: /dev/tty.usbserial-FTAQ6T45 + name: COM6 #指挥机-false,滑翔机/客户端-true isClient: true #指挥机帐号 @@ -38,17 +38,16 @@ #指挥机密码 serverPassword: 11 #滑翔机/客户端帐号 - clientAccount: TT0Z07 + clientAccount: TT0Z06 #指挥机目标号码,最多五个(不包括自己),多个号码用逗号隔开,通信方向:指挥机------>滑翔机 serverTarget: 8618765997865 #客户端目标号码,最多五个(不包括自己),多个号码用逗号隔开,通信方向:滑翔机------>指挥机 clientTarget: 8617400542542 #气象站串口 - meteorology: - name: COM1 -# name: /dev/tty.usbserial-A600NSYR - port: 4800 + meteorology: + name: COM3 + port: 4800 logging: level.root: info diff --git a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java index 14bcb82..1987ff2 100644 --- a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java +++ b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java @@ -25,12 +25,12 @@ /** * 硬件端口名 */ - @Value("${casic.serialPort.meteorology.name}") + @Value("${casic.meteorology.name}") private String serialPortName; /** * 硬件端口号 */ - @Value("${casic.serialPort.meteorology.port}") + @Value("${casic.meteorology.port}") private Integer serialPortNumber; private NRSerialPort serialPort; @@ -53,7 +53,7 @@ @Override public void run(String... args) { Set allPorts = NRSerialPort.getAvailableSerialPorts(); - log.info("Available port as follows " + JSON.toJSONString(allPorts)); + log.info("Available meteorology port as follows " + JSON.toJSONString(allPorts)); if (!allPorts.isEmpty()) { serialPort = new NRSerialPort(serialPortName, serialPortNumber); try { 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 7c64d4c..d5f76ff 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 @@ -15,7 +15,7 @@ public static final String CMD_DTU_MODE = "*XF,MODE=1,#"; public static final String CMD_WORK_MODE = "*W:DEV:S"; public static final String CMD_CENTER_NUMBER = "*W:SCA:8617400010200"; - public static final String CMD_CLIENT_NUMBER = "*W:SN:TT0Z07"; + public static final String CMD_CLIENT_NUMBER = "*W:SN:TT0Z06"; public static final String CMD_SERVER_NUMBER = "*W:SN:C"; private static final String CMD_SIGNAL = "*XF,S5,#"; @@ -85,7 +85,7 @@ + clientAccount + ", " + dataHex + "$^\""; - log.info(cmd); + log.info("Server send cmd ===> " + cmd); return cmd.getBytes(StandardCharsets.UTF_8); } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index d6bf295..5d83977 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -30,7 +30,7 @@ serialPort: #天通串口名,Windows下以COM开头,Linux和MacOS下串口名如下所示 - name: /dev/tty.usbserial-FTAQ6T45 + name: COM6 #指挥机-false,滑翔机/客户端-true isClient: true #指挥机帐号 @@ -38,17 +38,16 @@ #指挥机密码 serverPassword: 11 #滑翔机/客户端帐号 - clientAccount: TT0Z07 + clientAccount: TT0Z06 #指挥机目标号码,最多五个(不包括自己),多个号码用逗号隔开,通信方向:指挥机------>滑翔机 serverTarget: 8618765997865 #客户端目标号码,最多五个(不包括自己),多个号码用逗号隔开,通信方向:滑翔机------>指挥机 clientTarget: 8617400542542 #气象站串口 - meteorology: - name: COM1 -# name: /dev/tty.usbserial-A600NSYR - port: 4800 + meteorology: + name: COM3 + port: 4800 logging: level.root: info diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index af008f4..4c7790b 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: @activatedProperties@ + active: dev servlet: multipart: max-file-size: 50MB