From ee8b0a32b2f658b4a45fe3da4cbc13ce2fd33ffb Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Tue, 10 Dec 2024 13:25:18 +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=E6=B5=8B=E8=AF=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xydl/cac/controller/TestController.java   | 48 +++++--------------
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/xydl/cac/controller/TestController.java b/src/main/java/com/xydl/cac/controller/TestController.java
index 7842986..f77711d 100644
--- a/src/main/java/com/xydl/cac/controller/TestController.java
+++ b/src/main/java/com/xydl/cac/controller/TestController.java
@@ -1,6 +1,5 @@
 package com.xydl.cac.controller;
 
-import com.fazecast.jSerialComm.SerialPort;
 import com.xydl.cac.model.Response;
 import com.xydl.cac.model.StaticVariable;
 import com.xydl.cac.service.IcdFileConfigService;
@@ -16,12 +15,11 @@ import org.springframework.web.socket.WebSocketSession;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
 @RestController
-@Api(tags = {"测试接口"})
+@Api(tags = {"测试接口文档"})
 @RequestMapping("test")
 @Slf4j
 public class TestController extends BasicController {
@@ -91,50 +89,30 @@ public class TestController extends BasicController {
     }
 
     @GetMapping("/discover")
-    public Response<List<String>> discoverSerialPort() {
-        List<SerialPort> list1 = serialPortService.discoverSerialPort();
-        StaticVariable.serialPorts = list1;
-        List<String> list = new ArrayList<>();
-        list1.forEach(item -> {
-            list.add(item.getSystemPortName());
-        });
-        Response<List<String>> response = Response.success(list);
-        return response;
+    public Response<String> discoverSerialPort() {
+        Boolean aBoolean = serialPortService.discoverSerialPort();
+        if (aBoolean) {
+            return Response.success("发现了");
+        } else {
+            return Response.fail("未找到");
+        }
     }
 
     @GetMapping("/open")
-    public Response<Boolean> openSerialPort(String portname) {
-        for (SerialPort port : StaticVariable.serialPorts) {
-            if (port.getSystemPortName().equals(portname)) {
-                return Response.success(serialPortService.openSerialPort(port));
-            }
-        }
-        return Response.fail("Failed to find port ");
+    public Response<Boolean> openSerialPort() {
+        return Response.success(serialPortService.openSerialPort());
     }
 
     @GetMapping("/send")
-    public String sendData(int data,String portname) throws IOException {
+    public String sendData(boolean data) throws IOException {
         //发送数据注意，提前与接收设备沟通好协议，发送什么样类型的数据设备才可以进行响应，否则设备无响应
-        for (SerialPort port : StaticVariable.serialPorts) {
-            if (port.getSystemPortName().equals(portname)) {
-                if (data == 0) {
-                    serialPortService.sendData(port, false);
-                } else {
-                    serialPortService.sendData(port, true);
-                }
-
-            }
-        }
+        serialPortService.sendData(data);
         return "Data sent>>>";
     }
 
     @GetMapping("/close")
     public String closeSerialPort(String portname) {
-        for (SerialPort port : StaticVariable.serialPorts) {
-            if (port.getSystemPortName().equals(portname)) {
-                serialPortService.closeSerialPort(port,portname);
-            }
-        }
+        serialPortService.closeSerialPort();
         return "Serial port closed";
     }
 }