From 61d02c1796f3bedc6650e29cc33d9ee85e3a78fb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 19 六月 2023 08:07:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index e50d1dc..e841ee3 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -110,7 +110,7 @@
vo.setRgvNo(basRgv.getRgvNo()); // RGV鍙�
list.add(vo);
// 鑾峰彇RGV淇℃伅
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Crn, basRgv.getRgvNo());
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basRgv.getRgvNo());
if (rgvThread == null) {
continue;
}
@@ -119,7 +119,7 @@
continue;
}
- vo.setWorkNo1(rgvProtocol.getTaskNo1()); // 浠诲姟鍙�
+ vo.setWorkNo(rgvProtocol.getTaskNo1()); // 浠诲姟鍙�
if (rgvProtocol.getTaskNo1()>0) {
WrkMast wrkMast = wrkMastService.selectById(rgvProtocol.getTaskNo1());
if (wrkMast != null) {
@@ -145,23 +145,11 @@
StringBuilder str = new StringBuilder();
String s;
int i = 0;
- while((s = OutputQueue.CRN.poll()) != null && i <=10) {
+ while((s = OutputQueue.RGV.poll()) != null && i <=10) {
str.append("\n").append(s);
i++;
}
return R.ok().add(str.toString());
- }
-
- @GetMapping("/demo/status")
- public R demoStatus(){
- List<Map<String, Object>> res = new ArrayList<>();
- for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
- Map<String, Object> map = new HashMap<>();
- map.put("rgvNo", rgvSlave.getId());
- map.put("demo", rgvSlave.getDemo());
- res.add(map);
- }
- return R.ok().add(res);
}
/****************************************************************/
--
Gitblit v1.9.1