From e305c2c64ae1dc96d471c68b1f595b62da32de69 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 13 十一月 2025 11:55:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 27c8c85..7f31d4a 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -57,7 +57,7 @@
* 鑾峰彇鍏朵粬淇℃伅
*/
@GetMapping("/other")
- public R monitorOther(@RequestParam("crnId") Integer crnId) {
+ public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
Double xSpeed = 0.0D;
Double ySpeed = 0.0D;
Double zSpeed = 0.0D;
@@ -98,8 +98,8 @@
}
// 鑾峰彇杈撻�佺嚎plc绾跨▼
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, crnId);
- String ledContent = ledThread.getStringBuffer().toString();
+// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
+// String ledContent = ledThread.getWorkNos().toString();
// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
return R.ok(
@@ -111,8 +111,8 @@
.add("yDistance", Arith.multiplys(1, Math.abs(yDistance), 1)) // 绱鍗囬檷璺濈km
.add("xDuration", Arith.multiplys(1, Math.abs(xDuration), 1)) // 绱璧拌鏃堕暱h
.add("yDuration", Arith.multiplys(1, Math.abs(yDuration), 1)) // 绱鍗囬檷鏃堕暱h
- .add("isShow", !Cools.isEmpty(ledContent)) // 鏄惁鏄剧ず鍐呭
- .add("content", ledContent) // 鏄剧ず鍐呭
+// .add("isShow", !Cools.isEmpty(ledContent)) // 鏄惁鏄剧ず鍐呭
+// .add("content", ledContent) // 鏄剧ず鍐呭
);
}
--
Gitblit v1.9.1