From f4c155cd69fd0048bb0b1a06b578eb050aedd25b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 17 二月 2023 15:37:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SteController.java | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index 40cf485..ae3b776 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -7,10 +7,12 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.CrnStatusType;
+import com.zy.asrs.domain.param.SteModeParam;
import com.zy.asrs.domain.param.SteOperatorParam;
-import com.zy.asrs.domain.vo.SteMsgTableVo;
-import com.zy.asrs.domain.vo.SteStateTableVo;
import com.zy.asrs.domain.vo.SteDataVo;
+import com.zy.asrs.domain.vo.SteMsgTableVo;
+import com.zy.asrs.domain.vo.SteSensorDataVo;
+import com.zy.asrs.domain.vo.SteStateTableVo;
import com.zy.asrs.entity.BasSte;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasSteService;
@@ -25,6 +27,7 @@
import com.zy.core.model.command.SteCommand;
import com.zy.core.model.protocol.SteProtocol;
import com.zy.core.properties.SlaveProperties;
+import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.SteThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,6 +73,7 @@
continue;
}
vo.setTaskNo(steProtocol.getTaskNo().intValue()); // 浠诲姟鍙�
+ vo.setStatusVal(steProtocol.getMode().intValue()); // 鍦ㄧ嚎鐘舵��
vo.setStatusType(steProtocol.mode == 0 ? "绂荤嚎" : "鍦ㄧ嚎"); // 妯″紡鐘舵��
if (!Cools.isEmpty(steProtocol.getStatus())) {
vo.setStatus(steProtocol.getStatusType().desc); // 鐘舵��
@@ -97,6 +101,12 @@
}
if (!Cools.isEmpty(steProtocol.getChargeStatus())) {
vo.setChargeStatus(steProtocol.getChargeStatus()==1?"鉁�":"脳");
+ }
+ if (!Cools.isEmpty(steProtocol.getAlarm())) {
+ vo.setAlarm1(String.valueOf(steProtocol.getAlarm()));
+ }
+ if (!Cools.isEmpty(steProtocol.getAlarm0())) {
+ vo.setAlarm2(String.valueOf(steProtocol.getAlarm0()));
}
}
return R.ok().add(list);
@@ -176,6 +186,27 @@
return R.ok().add(vo);
}
+ @GetMapping("/sensor/detl/{steNo}")
+ public R steSensorDetl(@PathVariable("steNo") Integer steNo){
+ SteSensorDataVo vo = new SteSensorDataVo();
+ for (SteSlave ste : slaveProperties.getSte()) {
+ if (steNo.equals(ste.getId())) {
+ vo.setSteNo(ste.getId());
+ // 鑾峰彇绌挎杞︿俊鎭�
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
+ if (steThread == null) {
+ return R.error("璁惧涓嶅湪绾�");
+ }
+ SteProtocol steProtocol = steThread.getSteProtocol();
+ if (steProtocol == null) {
+ return R.error("璁惧涓嶅湪绾�");
+ }
+ break;
+ }
+ }
+ return R.ok().add(vo);
+ }
+
@PostMapping("/detl/update")
@ManagerAuth
public R steUpdate(SteDataVo vo){
@@ -200,6 +231,10 @@
} else {
throw new CoolException("鍛戒护涓嬪彂澶辫触");
}
+ basSte.setRow(vo.getRow());
+ basSte.setBay(vo.getBay());
+ basSte.setLev(vo.getLev());
+
basSte.setPakMk(vo.getPakMk());
basSte.setWrkNo(vo.getWorkNo());
basSte.setCrnNo(vo.getCrnNo());
@@ -214,6 +249,42 @@
/****************************************************************/
/************************** 鎵嬪姩鎿嶄綔 ******************************/
/****************************************************************/
+
+ @PostMapping("/mode/switch")
+ @ManagerAuth
+ public R crnDemo(SteModeParam param) throws InterruptedException {
+ if (Cools.isEmpty(param.getSteNo())){
+ return R.error();
+ }
+ if (Cools.isEmpty(param.getPassword())){
+ return R.error("璇疯緭鍏ュ彛浠�");
+ }
+ if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)){
+ return R.error("鍙ｄ护閿欒");
+ }
+ Thread.sleep(200L);
+ for (SteSlave steSlave : slaveProperties.getSte()) {
+ if (steSlave.getId().equals(param.getSteNo())) {
+ // 鑾峰彇绌挎杞︿俊鎭�
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steSlave.getId());
+ SteProtocol steProtocol = steThread.getSteProtocol();
+ if (steProtocol == null) { continue; }
+ SteCommand steCommand = new SteCommand();
+ steCommand.setSteNo(param.getSteNo()); // 绌挎杞︾紪鍙�
+ if (steProtocol.getMode() == 0) {
+ steCommand.setControlMode((short) 1);
+ } else {
+ steCommand.setControlMode((short) 0);
+ }
+ if (MessageQueue.offer(SlaveType.Ste, param.getSteNo(), new Task(2, steCommand))) {
+ return R.ok();
+ } else {
+ throw new CoolException("鍛戒护涓嬪彂澶辫触");
+ }
+ }
+ }
+ return R.ok();
+ }
@ManagerAuth(memo = "鎵嬪姩鎿嶄綔")
@PostMapping("/operator/ste")
@@ -238,9 +309,9 @@
steCommand.setSteNo(ste.getId()); // 绌挎杞︾紪鍙�
if (param.getSteTaskMode() == 16) {
steCommand.setComplete(true);
- } else if (param.getSteTaskMode() == 17) {
+ } else if (param.getSteTaskMode() == 99) {
steCommand.setControlMode((short) 1);
- } else if (param.getSteTaskMode() == 18) {
+ } else if (param.getSteTaskMode() == 100) {
steCommand.setControlMode((short) 0);
} else {
if (steTaskModeType == null) {
--
Gitblit v1.9.1