Junjie
2025-05-22 32b593115da09714624f3803fc43a6add07da391
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,44 @@
        return crnControl(command)?R.ok():R.error();
    }
    @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 = "暂停")
//    @PostMapping("/operator/pause")
//    public R crnPause(CrnOperatorParam param){