From 59ef340bc31a599a12c616a459977518d595aef5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 三月 2024 09:47:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs
---
src/main/java/com/zy/asrs/controller/CrnController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 05e21e0..e076aaf 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -35,6 +35,7 @@
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
+import com.zy.core.thread.RgvThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -384,6 +385,14 @@
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/pause")
// public R crnPause(CrnOperatorParam param){
--
Gitblit v1.9.1