From 6994981f40f1573f54de1a1e402a7743073cf38e Mon Sep 17 00:00:00 2001
From: fyxc <fyxc@qq.com>
Date: 星期四, 22 五月 2025 14:26:30 +0800
Subject: [PATCH] server commit file
---
src/main/java/com/zy/asrs/controller/CrnController.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 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 e076aaf..cd3019a 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -385,12 +385,42 @@
return crnControl(command)?R.ok():R.error();
}
- @ManagerAuth(memo = "瑙ｉ攣灏忚溅")
- @PostMapping("/lock")
- public R lock(CrnOperatorParam param){
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
- rgvThread.setPakMk(true);
- return R.ok();
+ @ManagerAuth(memo = "鎭㈠鑱旀満浠诲姟")
+ @PostMapping("/operator/taskRe")
+ public R taskRe(CrnOperatorParam param){
+ 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){
+ 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