From 0b21274e100080f7c240be714f31de0a1a6d626c Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 27 三月 2023 17:02:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java | 20 ++++++++++++++++++++
src/main/java/com/zy/asrs/controller/ShuttleController.java | 20 ++++++++++++--------
src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java | 14 +++++++-------
3 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index c9257f4..69f6996 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -70,9 +70,15 @@
vo.setBusyStatus(shuttleProtocol.getBusyStatusType().desc); //鍥涘悜绌挎杞︾姸鎬�
vo.setStatus(shuttleProtocol.getProtocolStatusType().desc);//褰撳墠浠诲姟鐘舵��
vo.setCurrentCode(shuttleProtocol.getCurrentCode());//褰撳墠浜岀淮鐮�
- vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() + "掳");//鐢垫睜娓╁害
vo.setBatteryPower(shuttleProtocol.getBatteryPower$() + "%");//鐢垫睜鐢甸噺
+ vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() + "掳");//鐢垫睜娓╁害
+ if (!Cools.isEmpty(shuttleProtocol.getErrorCode())) {
+ vo.setErrorCode(shuttleProtocol.getErrorCodeType().desc);//閿欒缂栧彿
+ }
vo.setPlcOutputStatusIO(shuttleProtocol.getPlcOutputStatusIO());//Plc杈撳嚭鐘舵�両O
+ if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
+ vo.setStatusErrorCode(shuttleProtocol.getStatusErrorCode());//閿欒淇℃伅鐮�
+ }
vo.setPlcInputStatus(shuttleProtocol.getPlcInputStatus());//PLC杈撳叆鐘舵��
vo.setCurrentOrBeforeCode(shuttleProtocol.getCurrentOrBeforeCode());//褰撳墠鎴栬�呬箣鍓嶈鍒扮殑浜岀淮鐮佸��
vo.setCodeOffsetX(shuttleProtocol.getCodeOffsetX());//璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�
@@ -80,15 +86,9 @@
vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//褰撳墠鐨勭數鍘嬪��
vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//褰撳墠鐨勬ā鎷熼噺鍊�
vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
- vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//绉诲姩閫熷害
+ vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//褰撳墠鐨勮璧颁己鏈嶉�熷害
vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad());//褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼
vo.setCurrentMoveServoLoad(shuttleProtocol.getCurrentMoveServoLoad());//褰撳墠鐨勮璧颁己鏈嶈礋杞界巼
- if (!Cools.isEmpty(shuttleProtocol.getErrorCode())) {
- vo.setErrorCode(shuttleProtocol.getErrorCode());//閿欒缂栧彿
- }
- if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
- vo.setStatusErrorCode(shuttleProtocol.getStatusErrorCode());//閿欒淇℃伅鐮�
- }
}
return R.ok().add(list);
}
@@ -124,6 +124,10 @@
if (shuttleProtocol.getProtocolStatusType() != null) {
vo.setStatus(shuttleProtocol.getProtocolStatusType().desc);//鐘舵��
}
+ vo.setCodeOffsetX(shuttleProtocol.getCodeOffsetX());//璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�
+ vo.setCodeOffsetY(shuttleProtocol.getCodeOffsetY());//璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲�
+ vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//褰撳墠鐨勭數鍘嬪��
+ vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//褰撳墠鐨勬ā鎷熼噺鍊�
vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//褰撳墠鐨勮璧颁己鏈嶉�熷害
vo.setCurrentMoveServoLoad(shuttleProtocol.getCurrentMoveServoLoad() + "%");//褰撳墠鐨勮璧颁己鏈嶈礋杞界巼
vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad() + "%");//褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼
diff --git a/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java
index 3802838..c09001b 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java
@@ -27,6 +27,26 @@
private String pakMk = "-";
/**
+ * 璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�
+ */
+ private Short codeOffsetX;
+
+ /**
+ * 璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲�
+ */
+ private Short codeOffsetY;
+
+ /**
+ * 褰撳墠鐨勭數鍘嬪��
+ */
+ private Short currentVoltage;
+
+ /**
+ * 褰撳墠鐨勬ā鎷熼噺鍊�
+ */
+ private Short currentAnalogValue;
+
+ /**
* 褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
*/
private Short currentLiftServoSpeed;
diff --git a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
index c51d251..abc0597 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
@@ -45,7 +45,7 @@
/**
* 閿欒缂栧彿
*/
- private Short errorCode;
+ private String errorCode;
/**
* Plc杈撳嚭鐘舵�両O
@@ -60,7 +60,7 @@
/**
* 閿欒淇℃伅鐮佹灇涓�
*/
- private ShuttleErrorCodeType statusErrorCodeType;
+ private ShuttleErrorCodeType errorCodeType;
/**
* PLC杈撳叆鐘舵��
@@ -122,19 +122,19 @@
*/
public String loca = "-";
- public String getStatusErrorCode$() {
- if(this.statusErrorCodeType == null) return null;
- return this.statusErrorCodeType.desc;
+ public String getErrorCode$() {
+ if(this.errorCodeType == null) return null;
+ return this.errorCodeType.desc;
}
public void setStatusErrorCode(Short statusErrorCode) {
this.statusErrorCode = statusErrorCode;
- this.statusErrorCodeType = ShuttleErrorCodeType.get(statusErrorCode.intValue());
+ this.errorCodeType = ShuttleErrorCodeType.get(statusErrorCode);
}
public void setStatusErrorCode(ShuttleErrorCodeType type) {
this.statusErrorCode = type.id.shortValue();
- this.statusErrorCodeType = type;
+ this.errorCodeType = type;
}
}
--
Gitblit v1.9.1