From 35fac40cfc0d636479bde094391e6f237b3116d4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 29 十一月 2023 15:29:58 +0800
Subject: [PATCH] #指令更新
---
src/main/java/com/zy/asrs/controller/CrnController.java | 141 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 133 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 17e93cd..fe5a746 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -20,6 +19,7 @@
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.asrs.utils.CommandUtils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -36,8 +36,10 @@
import com.zy.core.properties.SystemProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -50,6 +52,13 @@
@Slf4j
@RestController
public class CrnController {
+
+ @Value("${wms.url}")
+ private String wmsUrl;
+ @Value("${wms.movePath}")
+ private String movePath;
+
+
@Autowired
private SlaveProperties slaveProperties;
@@ -290,7 +299,7 @@
vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
- vo.setWrkStatus(crnProtocol.getStatusType().desc); // 浠诲姟鐘舵��
+ vo.setWrkStatus(crnProtocol.getStatusType().id); // 浠诲姟鐘舵��
vo.setLoading((crnProtocol.getLoaded() != null && crnProtocol.getLoaded() == 1) ? "鏈夌墿" : "鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
@@ -303,6 +312,8 @@
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
}
+ vo.setInEnable(basCrnp.getInEnable());
+ vo.setOutEnable(basCrnp.getOutEnable());
}
return R.ok().add(list);
}
@@ -561,7 +572,7 @@
crnCommand.setCommand((short) 0); // 浠诲姟瀹屾垚纭浣�
// 寤舵椂鍙戦��
Thread.sleep(1000L);
- if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand))) {
+ if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand), false)) {
return R.ok();
} else {
throw new CoolException("鍛戒护涓嬪彂澶辫触");
@@ -573,6 +584,120 @@
return R.error();
}
+
+ @ManagerAuth(memo = "鍒囨崲鑱旀満妯″紡")
+ @PostMapping("/crn/operator/auto")
+ public R crnAuto(CrnOperatorParam param){
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAuto((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "鍒囨崲鍗婃墜鍔ㄦā寮�")
+ @PostMapping("/crn/operator/semiAutomatic")
+ public R crnsemiAutomatic(CrnOperatorParam param){
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAuto((short)2);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "鍒囨崲鎵嬪姩妯″紡")
+ @PostMapping("/crn/operator/hand")
+ public R onlineWrk1(CrnOperatorParam param){
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAuto((short)3);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "鐢宠瀹屾垚浠诲姟")
+ @PostMapping("/crn/operator/onlineWrk1")
+ public R onlineWrk2(CrnOperatorParam param){
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setOnlineWrk1((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "鐢宠鍙栨秷浠诲姟")
+ @PostMapping("/crn/operator/onlineWrk2")
+ public R onlineWrk3(CrnOperatorParam param){
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setOnlineWrk2((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "娓呴櫎鑱旀満浠诲姟")
+ @PostMapping("/crn/operator/onlineWrk3")
+ public R onlineWrk4(CrnOperatorParam param){
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setOnlineWrk3((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+ @ManagerAuth(memo = "鎭㈠鑱旀満浠诲姟")
+ @PostMapping("/crn/operator/onlineWrk4")
+ public R crnHand(CrnOperatorParam param){
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setOnlineWrk4((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+
+
+
+ private boolean crnControl2(CrnCommand command){
+ if (command.getCrnNo() == null) {
+ throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
+ }
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ if (command.getCrnNo().equals(crn.getId())) {
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ if (crnThread == null) {
+ throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+ }
+ // 绌洪棽鍒ゆ柇
+// if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
+ if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(4, command), false)) {
+ return true;
+ } else {
+ throw new CoolException("鍛戒护涓嬪彂澶辫触");
+ }
+// } else {
+// throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ┖闂茬姸鎬�");
+// }
+ }
+ }
+ return false;
+ }
+
+
+
+
private boolean crnControl(CrnCommand command){
if (command.getCrnNo() == null) {
@@ -591,11 +716,11 @@
}
// 绌洪棽鍒ゆ柇
// if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
- if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) {
- return true;
- } else {
- throw new CoolException("鍛戒护涓嬪彂澶辫触");
- }
+ if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(2, command), false)) {
+ return true;
+ } else {
+ throw new CoolException("鍛戒护涓嬪彂澶辫触");
+ }
// } else {
// throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ┖闂茬姸鎬�");
// }
--
Gitblit v1.9.1