From 4cc10691cd2197f72c205723a642a62478c33273 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期二, 31 五月 2022 09:04:22 +0800
Subject: [PATCH] # ycq
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index c5484c1..8977b4f 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -12,8 +12,12 @@
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.thread.LedThread;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -53,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;
@@ -76,10 +80,10 @@
forkPos = 1;
break;
case 1:
- forkPos = 0;
+ forkPos = 2;
break;
case 2:
- forkPos = 2;
+ forkPos = 0;
break;
default:
forkPos = 1;
@@ -93,20 +97,22 @@
}
}
-// int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
-// int totalLoc = reportQueryMapper.getTotalLocByCrnId();
+ // 鑾峰彇杈撻�佺嚎plc绾跨▼
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
+ String ledContent = ledThread.getWorkNos().toString();
+// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
return R.ok(
Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 琛岃蛋閫熷害
.add("ySpeed", Arith.multiplys(1, Math.abs(ySpeed), 1)) // 鍗囬檷閫熷害
.add("zSpeed", Arith.multiplys(1, Math.abs(zSpeed), 1)) // 鍙夌墮閫熷害
.add("forkPos", forkPos) // 鍙夌墮閫熷害
-// .add("totalLoc", totalLoc) // 鎬诲簱浣嶆暟
-// .add("totalWrk", totalWrk) // 鎬讳换鍔℃暟
.add("xDistance", Arith.multiplys(1, Math.abs(xDistance), 1)) // 绱璧拌璺濈km
.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) // 鏄剧ず鍐呭
);
}
--
Gitblit v1.9.1