From d2314059892561c4d9f89264db43cf92d741eb42 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 26 六月 2025 15:05:08 +0800
Subject: [PATCH] 完善待测
---
src/main/java/com/zy/asrs/controller/CrnController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 52fadad..b9c4974 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -91,7 +91,11 @@
vo.setStatus(1); // 鐘舵��
Task task = MessageQueue.peek(SlaveType.Crn, crn.getId());
if (task != null) {
- vo.setCommand(JSON.toJSONString((CrnCommand)task.getData()));
+ try{
+ vo.setCommand(JSON.toJSONString((CrnCommand)task.getData()));
+ } catch (Exception e){
+
+ }
}
}
return R.ok().add(list);
@@ -420,6 +424,7 @@
crnCommand.setCrnNo(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskMode(CrnTaskModeType.CLEAR);
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setCommand((short) 0); // 浠诲姟瀹屾垚纭浣�
// 寤舵椂鍙戦��
Thread.sleep(1000L);
if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand))) {
--
Gitblit v1.9.1