From c79b75708d9d524015c33f986beaa28513122954 Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Tue, 21 Nov 2023 20:03:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E9=A9=B1=E5=8A=A8=E5=BC=80?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sv/barcode/button/EnterClick.java | 5 +++- .../java/com/sv/barcode/button/OutClick.java | 4 +++ .../com/sv/intergration/MessageService.java | 5 ++++ .../sv/intergration/impl/OldDoorService.java | 28 +++++++++++++------ 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/netty-client/src/main/java/com/sv/barcode/button/EnterClick.java b/netty-client/src/main/java/com/sv/barcode/button/EnterClick.java index ef1f18c..6b3473c 100644 --- a/netty-client/src/main/java/com/sv/barcode/button/EnterClick.java +++ b/netty-client/src/main/java/com/sv/barcode/button/EnterClick.java @@ -1,7 +1,8 @@ package com.sv.barcode.button; +import com.sv.intergration.DoorService; +import com.sv.intergration.impl.OldDoorService; import com.sv.netty.ClientHandler; -import com.sv.netty.ClientThread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,6 +15,8 @@ public class EnterClick implements ActionListener { @Override public void actionPerformed(ActionEvent e) { + DoorService doorService = new OldDoorService(); + doorService.enterOpenDoor(); // 开门 logger.error("开门成功！！！！！！！"); } diff --git a/netty-client/src/main/java/com/sv/barcode/button/OutClick.java b/netty-client/src/main/java/com/sv/barcode/button/OutClick.java index e729258..c303a2f 100644 --- a/netty-client/src/main/java/com/sv/barcode/button/OutClick.java +++ b/netty-client/src/main/java/com/sv/barcode/button/OutClick.java @@ -1,5 +1,7 @@ package com.sv.barcode.button; +import com.sv.intergration.DoorService; +import com.sv.intergration.impl.OldDoorService; import com.sv.netty.ClientHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,6 +15,8 @@ public class OutClick implements ActionListener { @Override public void actionPerformed(ActionEvent e) { + DoorService doorService = new OldDoorService(); + doorService.outOpenDoor(); // 开门 logger.error("开门成功！！！！！！！"); } diff --git a/netty-client/src/main/java/com/sv/intergration/MessageService.java b/netty-client/src/main/java/com/sv/intergration/MessageService.java index a6c9d37..8992c56 100644 --- a/netty-client/src/main/java/com/sv/intergration/MessageService.java +++ b/netty-client/src/main/java/com/sv/intergration/MessageService.java @@ -1,5 +1,6 @@ package com.sv.intergration; +import com.sv.intergration.impl.OldDoorService; import com.sv.netty.config.VenueMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,6 +50,8 @@ public class MessageService { * 门禁开门 */ public void enterDoor() { + DoorService doorService = new OldDoorService(); + doorService.enterOpenDoor(); // 开门 logger.info("开门成功！！！"); } @@ -57,6 +60,8 @@ public class MessageService { * 门禁开门 */ public void outDoor() { + DoorService doorService = new OldDoorService(); + doorService.outOpenDoor(); // 开门 logger.info("开门成功！！！"); } diff --git a/netty-client/src/main/java/com/sv/intergration/impl/OldDoorService.java b/netty-client/src/main/java/com/sv/intergration/impl/OldDoorService.java index 6fb2f9b..1c4dbd2 100644 --- a/netty-client/src/main/java/com/sv/intergration/impl/OldDoorService.java +++ b/netty-client/src/main/java/com/sv/intergration/impl/OldDoorService.java @@ -21,17 +21,19 @@ public class OldDoorService implements DoorService { connector.OpenForciblyConnect(tcpClientDetial); CommandDetial detial = new CommandDetial(); detial.Connector = tcpClientDetial; - detial.Identity = new FC8800Identity("MC-5824T28085603", "FFFFFFFF", E_ControllerType.FC8900); + detial.Identity = new FC8800Identity("MC-5824T23014127", "12345678", E_ControllerType.FC8900); OpenDoor_Parameter openDoorParameter = new OpenDoor_Parameter(detial); - openDoorParameter.Door.SetDoor(1, 1); OpenDoor openDoor = new OpenDoor(openDoorParameter); boolean command = connector.AddCommand(openDoor); + if (!command) { + logger.error("入场开门命令执行失败"); + } if (openDoor.getIsTimeout()) { - logger.info("----open door timeout ----"); + logger.info("----in open door timeout ----"); } } catch (Exception e) { - logger.error("----open door error ----", e); + logger.error("----in open door error ----", e); } } @@ -45,17 +47,27 @@ public class OldDoorService implements DoorService { connector.OpenForciblyConnect(tcpClientDetial); CommandDetial detial = new CommandDetial(); detial.Connector = tcpClientDetial; - detial.Identity = new FC8800Identity("MC-5824T28085603", "FFFFFFFF", E_ControllerType.FC8900); + detial.Identity = new FC8800Identity("MC-5824T23014127", "12345678", E_ControllerType.FC8900); OpenDoor_Parameter openDoorParameter = new OpenDoor_Parameter(detial); - openDoorParameter.Door.SetDoor(2, 1); OpenDoor openDoor = new OpenDoor(openDoorParameter); boolean command = connector.AddCommand(openDoor); + System.out.println(command); + if (!command) { + logger.error("出场开门命令执行失败"); + } if (openDoor.getIsTimeout()) { - logger.info("----open door timeout ----"); + logger.info("----out open door timeout ----"); } } catch (Exception e) { - logger.error("----open door error ----", e); + logger.error("----out open door error ----", e); } } + + // 测试 + public static void main(String[] args) { + OldDoorService oldDoorService = new OldDoorService(); + oldDoorService.enterOpenDoor(); + oldDoorService.outOpenDoor(); + } }