From 3706e22c00bd2afa0fe0cd68d63e87cfc82ec815 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Mon, 9 Dec 2024 13:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E7=A1=AC=E6=8E=A5=E7=82=B9?=
 =?UTF-8?q?=E8=A3=85=E7=BD=AE=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xydl/cac/service/impl/SerialPortServiceImpl.java   | 7 ++++++-
 src/main/resources/application-dev.yml                     | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

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<SerialPort> 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