From 67dc291b3ed8a7fc43519bb5df2620301269b72c Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期日, 15 六月 2025 13:28:26 +0800
Subject: [PATCH] 完成调试
---
src/main/java/com/zy/asrs/controller/CrnController.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 11082d5..cd3019a 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -388,17 +388,39 @@
@ManagerAuth(memo = "鎭㈠鑱旀満浠诲姟")
@PostMapping("/operator/taskRe")
public R taskRe(CrnOperatorParam param){
- CrnCommand command = new CrnCommand();
- command.setTaskRe((short)1);
- return crnControl(command)?R.ok():R.error();
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, param.getCrnNo());
+ if (crnThread == null) {
+ return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+
+ if (MessageQueue.offer(SlaveType.Crn, param.getCrnNo(), new Task(4, null))) {
+ return R.ok();
+ } else {
+ return R.error("鍛戒护涓嬪彂澶辫触");
+ }
}
@ManagerAuth(memo = "娓呴櫎鑱旀満浠诲姟")
@PostMapping("/operator/taskClear")
public R crnTaskClear(CrnOperatorParam param){
- CrnCommand command = new CrnCommand();
- command.setTaskClear((short)1);
- return crnControl(command)?R.ok():R.error();
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, param.getCrnNo());
+ if (crnThread == null) {
+ return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+
+ if (MessageQueue.offer(SlaveType.Crn, param.getCrnNo(), new Task(5, null))) {
+ return R.ok();
+ } else {
+ return R.error("鍛戒护涓嬪彂澶辫触");
+ }
}
// @ManagerAuth(memo = "鏆傚仠")
--
Gitblit v1.9.1