From 734c664f671365f43149b9150ccfc287fb11d7fa Mon Sep 17 00:00:00 2001 From: tqs <56479841@qq.com> Date: 星期日, 29 一月 2023 16:29:28 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++++-- src/main/java/com/zy/asrs/controller/MonitorController.java | 44 -------------------------------------------- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java index b5e0466..0f7ab22 100644 --- a/src/main/java/com/zy/asrs/controller/MonitorController.java +++ b/src/main/java/com/zy/asrs/controller/MonitorController.java @@ -76,50 +76,6 @@ return R.ok(pakinRep); } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /** * 鑷姩琛ラ浂 */ diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 56b1ffe..844bea9 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -207,13 +207,17 @@ if (!result) { throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触"); } - String successMsg = "鍏ュ簱宸ヤ綔妗�--宸ヤ綔鍙�:" + dto.getWorkNo() + " 鐩爣搴撲綅:" + dto.getLocNo(); - MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, successMsg)); + + if (ledThread != null) { + String successMsg = "鍏ュ簱宸ヤ綔妗�--宸ヤ綔鍙�:" + dto.getWorkNo() + " 鐩爣搴撲綅:" + dto.getLocNo(); + MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, successMsg)); + } } else { staProtocol.setWorkNo((short) 9998); staProtocol.setStaNo((short) 14); devpThread.setPakMk(staProtocol.getSiteId(), false); MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); + if (ledThread != null) { String errorMsg = jsonObject.getString("msg"); if (!Cools.isEmpty(errorMsg)) { -- Gitblit v1.9.1