From ee31bca5de8694a848cbfa71a9fd6ab11a5f6c14 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 28 一月 2021 14:10:40 +0800
Subject: [PATCH] #双边输送线严重bug
---
src/main/java/com/zy/asrs/controller/CrnController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 4b5edf5..d1f80c2 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -38,12 +38,15 @@
import com.zy.core.properties.SystemProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 鍫嗗灈鏈烘帴鍙�
@@ -139,17 +142,29 @@
if (crnProtocol.getPlatformLow()) {
vo.setSitePos("绔欏彴楂樹綅");
}
-// vo.setXOrigin(crnProtocol.getBay()==1?"鏄�":"鍚�"); // 璧拌鍘熺偣
-// vo.setYOrigin(crnProtocol.getLevel()==1?"鏄�":"鍚�"); // 鍗囬檷鍘熺偣
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
-// vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"鏄�":"鍚�"); // 鎬ュ仠
- vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
- vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
- vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3()));
- vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4()));
-// vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); // 寮傚父鐮�
+ if (crnProtocol.getAlarm1() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+ vo.setAlarm1(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ }
+ if (crnProtocol.getAlarm2() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm2());
+ vo.setAlarm2(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ }
+ if (crnProtocol.getAlarm3() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm3());
+ vo.setAlarm3(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ }
+ if (crnProtocol.getAlarm4() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm4());
+ vo.setAlarm4(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ }
+// vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
+// vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
+// vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3()));
+// vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4()));
}
return R.ok().add(list);
@@ -176,10 +191,6 @@
}
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
- if (null != crnError) {
- vo.setError(crnError.getErrName());
- }
if (crnProtocol.getTaskNo()>0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
@@ -216,6 +227,20 @@
return R.ok().add(str.toString());
}
+
+ @GetMapping("/demo/status")
+ public R demoStatus(){
+ List<Map<String, Object>> res = new ArrayList<>();
+ for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("crnNo", crnSlave.getId());
+ map.put("demo", crnSlave.getDemo());
+ res.add(map);
+ }
+ return R.ok().add(res);
+ }
+
+
@PostMapping("/demo/switch")
@ManagerAuth(memo = "鍫嗗灈鏈烘紨绀�")
public R crnDemo(CrnDemoParam param) throws InterruptedException {
@@ -229,11 +254,17 @@
return R.error("鍙ｄ护閿欒");
}
Thread.sleep(200L);
- mainService.crnDemoOfLocMove(param.getCrnId());
+ for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ if (crnSlave.getId().equals(param.getCrnId())) {
+ crnSlave.setDemo(param.getOpt());
+ }
+ }
+// mainService.crnDemoOfLocMove(param.getCrnId());
return R.ok();
}
+
/****************************************************************/
/************************** 鎵嬪姩鎿嶄綔 ******************************/
/****************************************************************/
--
Gitblit v1.9.1