From 5769bdadc879fa93523be0e95ffc8d5ee9ba1e01 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 10:40:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 2
src/main/java/com/zy/asrs/controller/ConsoleController.java | 26 +++++++++++-
src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java | 19 ++-------
src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java | 18 ++++++++
4 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index f04eeb6..7d08ab0 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -3,6 +3,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
@@ -12,11 +13,15 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
+import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -99,11 +104,26 @@
@ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�")
public R crnLatestData(){
List<CrnLatestDataVo> vos = new ArrayList<>();
- for (int i =1; i<=2; i++){
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
CrnLatestDataVo vo = new CrnLatestDataVo();
- vo.setCrnId(i);
- vo.setOffset((double) new Random().nextInt(560));
+ vo.setCrnId(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
+ vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
+ /**
+ * 鍫嗗灈鏈虹姸鎬佸垽鏂�
+ */
+ if (crnProtocol.getTaskNo()>0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setCrnStatusType(CrnStatusType.process(wrkMast.getIoType()));
+ }
+ } else {
+ vo.setCrnStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO: CrnStatusType.UN_AUTO);
+ }
vos.add(vo);
+
}
return R.ok().add(vos);
}
diff --git a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
index 7b56ef6..d3d54fd 100644
--- a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
@@ -34,4 +34,20 @@
public void setDesc(String desc) {
this.desc = desc;
- }}
+ }
+
+ public static CrnStatusType process(Integer ioType){
+ if (ioType>100) {
+ return TAKE;
+ } else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
+ return PUT;
+ } else if (ioType == 3) {
+ return SITE_MOVE;
+ } else if (ioType == 11) {
+ return STOCK_MOVE;
+ } else {
+ return ERROR;
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
index b961f73..b75dd52 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
@@ -1,9 +1,13 @@
package com.zy.asrs.domain.vo;
+import com.zy.asrs.domain.enums.CrnStatusType;
+import lombok.Data;
+
/**
* 鍫嗗灈鏈烘渶鏂版暟鎹鍥惧璞�
* Created by vincent on 2020-06-01
*/
+@Data
public class CrnLatestDataVo {
// 鍫嗗灈鏈虹紪鍙�
@@ -12,19 +16,6 @@
// 鍋忕Щ閲�
private Double offset;
- public Integer getCrnId() {
- return crnId;
- }
+ private CrnStatusType crnStatusType;
- public void setCrnId(Integer crnId) {
- this.crnId = crnId;
- }
-
- public Double getOffset() {
- return offset;
- }
-
- public void setOffset(Double offset) {
- this.offset = offset;
- }
}
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 1c2ff6e..436f03b 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -14,7 +14,7 @@
// ----------------------------------------------------------------
// 宸ヤ綔鍙�
- private Short workNo;
+ private Short workNo = 0;
// ----------------------------------------------------------------
// 鐩爣绔�
--
Gitblit v1.9.1