diff --git a/src/main/java/com/xydl/cac/service/impl/SerialPortServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/SerialPortServiceImpl.java index 3365feb..ca60093 100644 --- a/src/main/java/com/xydl/cac/service/impl/SerialPortServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/SerialPortServiceImpl.java @@ -2,6 +2,7 @@ package com.xydl.cac.service.impl; import com.fazecast.jSerialComm.SerialPort; import com.xydl.cac.service.SerialPortService; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.IOException; @@ -10,6 +11,10 @@ import java.util.List; @Service public class SerialPortServiceImpl implements SerialPortService { + + @Value("${cac.warnport.name}") + public boolean warnportname; + public List serialPortList; @Override @@ -52,7 +57,7 @@ public class SerialPortServiceImpl implements SerialPortService { @Override public Boolean openSerialPort(SerialPort port) { - if (port.getSystemPortName().equals("COM6")) { + if (port.getSystemPortName().equals(warnportname)) { int baudRate = 9600; // 波特率 int parity = SerialPort.EVEN_PARITY; // 校验位 int dataBits = 8; // 数据位 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ef5c1d6..becb583 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -40,7 +40,7 @@ spring: cac: datapath: /home/xydl/ncac/data 61850: - enable: true + enable: false i2: enable: false url: http://192.168.1.190:8080/busi-back-ws/service/XydlService @@ -49,3 +49,5 @@ cac: token: e65e730cba22e320e16926fd4ff19ce787fa2162d065792bb6562c6d4a4cf328 secret: SEC72e5fb1b4ce7f9fed55386040d599035c50f8d2a181ad66bd1277549f0716124 rsakey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y= + warnport: + name: ttyCH341USB0