From c59bcfa4429a5d67842ebaa492db1fa11a3e97fc Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期四, 10 七月 2025 09:21:25 +0800 Subject: [PATCH] 输送线异常提示 --- src/main/java/com/zy/asrs/controller/ConsoleController.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java index a77541d..b1a0503 100644 --- a/src/main/java/com/zy/asrs/controller/ConsoleController.java +++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java @@ -121,7 +121,8 @@ StaProtocol staProtocol = entry.getValue(); vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿 vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙� - vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵�� + String faultDescription = staProtocol.getFaultDescription(); + vo.setSiteStatus(Cools.isEmpty(faultDescription) ? SiteStatusType.process(staProtocol) : SiteStatusType.SITE_ERROR); // 鐘舵�� vo.setNearbySta(staProtocol.getNearbySta()); //RGV浣嶇疆 vos.add(vo); } @@ -303,6 +304,7 @@ vo.setCanining(basDevp.getCanining()); // 鑳藉叆 vo.setCanouting(basDevp.getCanouting()); // 鑳藉嚭 + vo.setError(staProtocol.getFaultDescription()); return R.ok().add(vo); } -- Gitblit v1.9.1