From 61eeab28ca6b4c16508953efd7e613ee9dea823b Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期一, 15 九月 2025 16:27:08 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/TVController.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java index 87211a4..1cc149f 100644 --- a/src/main/java/com/zy/asrs/controller/TVController.java +++ b/src/main/java/com/zy/asrs/controller/TVController.java @@ -19,6 +19,7 @@ import com.zy.common.service.CommonService; import com.zy.common.utils.RedisUtil; import com.zy.core.cache.SlaveConnection; +import com.zy.core.enums.ShuttleProtocolStatusType; import com.zy.core.enums.SlaveType; import com.zy.core.model.LedSlave; import com.zy.core.model.ShuttleSlave; @@ -385,6 +386,16 @@ map.put("errorMsg", errName);//寮傚父淇℃伅 map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅 list.add(map); + } else if (shuttleProtocol.getMode() != 1) { + map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙� + map.put("errorMsg", shuttleProtocol.getMode$());//寮傚父淇℃伅 + map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅 + list.add(map); + } else if (shuttleProtocol.getProtocolStatusType() != ShuttleProtocolStatusType.IDLE) { + map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙� + map.put("errorMsg", shuttleProtocol.getProtocolStatus$());//寮傚父淇℃伅 + map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅 + list.add(map); } } return R.ok().add(list); -- Gitblit v1.9.1