From 8bae1dc75fbe2f45a72666a30d7899590b01da21 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 13 十一月 2020 16:51:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 76 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 52a5495..6277cca 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.core.exception.CoolException;
@@ -10,8 +11,10 @@
import com.zy.asrs.domain.vo.CrnMsgTableVo;
import com.zy.asrs.domain.vo.CrnStateTableVo;
import com.zy.asrs.entity.BasCrnError;
+import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -25,7 +28,7 @@
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.CrnThread;
+import com.zy.core.CrnThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -50,6 +53,8 @@
private WrkMastService wrkMastService;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private BasCrnpService basCrnpService;
@ManagerAuth(memo = "杩涜涓殑鍛戒护")
@@ -83,21 +88,21 @@
@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
public R crnStateTable(){
List<CrnStateTableVo> list = new ArrayList<>();
- for (CrnSlave crn : slaveProperties.getCrn()) {
+ List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
+ for (BasCrnp basCrnp : crnps) {
+ // 琛ㄦ牸琛�
+ CrnStateTableVo vo = new CrnStateTableVo();
+ vo.setCrnNo(basCrnp.getCrnNo()); // 鍫嗗灈鏈哄彿
+ list.add(vo);
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if (crnThread == null) {
- log.error("{}鍙峰爢鍨涙満杩炴帴澶辫触", crn.getId());
continue;
}
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
if (crnProtocol == null) {
- log.error("{}鍙峰爢鍨涙満杩炴帴澶辫触", crn.getId());
continue;
}
- // 琛ㄦ牸琛�
- CrnStateTableVo vo = new CrnStateTableVo();
- vo.setCrnNo(crn.getId()); // 鍫嗗灈鏈哄彿
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
if (crnProtocol.getTaskNo()>0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
@@ -116,9 +121,8 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
- vo.setStop(crnProtocol.getCrnTemp1().stop?"鏄�":"鍚�"); // 鎬ュ仠
- vo.setWarnCode(String.valueOf(crnProtocol.getAlarm())); // 寮傚父鐮�
- list.add(vo);
+ vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"鏄�":"鍚�"); // 鎬ュ仠
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); // 寮傚父鐮�
}
return R.ok().add(list);
}
@@ -127,9 +131,14 @@
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
public R crnMsgTable(){
List<CrnMsgTableVo> list = new ArrayList<>();
- for (CrnSlave crn : slaveProperties.getCrn()) {
+ List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
+ for (BasCrnp basCrnp : crnps) {
+ // 琛ㄦ牸琛�
+ CrnMsgTableVo vo = new CrnMsgTableVo();
+ vo.setCrnNo(basCrnp.getCrnNo()); // 鍫嗗灈鏈哄彿
+ list.add(vo);
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
if (crnThread == null) {
continue;
}
@@ -137,13 +146,11 @@
if (crnProtocol == null) {
continue;
}
- // 琛ㄦ牸琛�
- CrnMsgTableVo vo = new CrnMsgTableVo();
- vo.setCrnNo(crn.getId()); // 鍫嗗灈鏈哄彿
+
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
if (null != crnError) {
- vo.setError(crnError.getErrorCode() + crnError.getErrName());
+ vo.setError(crnError.getErrName());
}
if (crnProtocol.getTaskNo()>0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
@@ -164,8 +171,6 @@
vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
- list.add(vo);
-
}
return R.ok().add(list);
}
@@ -202,6 +207,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -219,6 +225,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -236,6 +243,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -253,6 +261,7 @@
command.setDestinationPosX(param.getStaNo()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -304,6 +313,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
return crnControl(command)?R.ok():R.error();
}
@@ -417,4 +427,30 @@
return false;
}
+ private void staNoProcess(CrnOperatorParam param, CrnCommand command){
+ if (param.getSourceStaNo()!=null) {
+ if (param.getSourceStaNo() == 5) {
+ command.setSourcePosX((short) 2); // 婧愬簱浣嶆帓
+ command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+ command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
+ } else if (param.getSourceStaNo() == 6) {
+ command.setSourcePosX((short) 1); // 婧愬簱浣嶆帓
+ command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+ command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
+ }
+ }
+ if (param.getStaNo()!=null) {
+ if (param.getStaNo() == 5) {
+ command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+ } else if (param.getStaNo() == 6) {
+ command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+ }
+ }
+ }
+
+
}
--
Gitblit v1.9.1