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> discoverSerialPort() { - List list1 = serialPortService.discoverSerialPort(); - StaticVariable.serialPorts = list1; - List list = new ArrayList<>(); - list1.forEach(item -> { - list.add(item.getSystemPortName()); - }); - Response> response = Response.success(list); - return response; + public Response discoverSerialPort() { + Boolean aBoolean = serialPortService.discoverSerialPort(); + if (aBoolean) { + return Response.success("发现了"); + } else { + return Response.fail("未找到"); + } } @GetMapping("/open") - public Response 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 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"; } }