From 844381b5feeb874c4a6f51bf0521611b3f097993 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 一月 2025 17:00:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java | 43 +++++++++++++++++--------------------------
1 files changed, 17 insertions(+), 26 deletions(-)
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 99302f5..1d11cd8 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
@@ -1,9 +1,6 @@
package com.zy.asrs.domain.vo;
-import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasShuttleErr;
-import com.zy.asrs.service.BasShuttleErrService;
-import com.zy.core.enums.ShuttleErrorCodeType;
+import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.ShuttleStatusType;
import lombok.Data;
@@ -14,7 +11,7 @@
private Integer shuttleNo;
// 鐘舵��
- private String status = "-";
+ private Integer status;
//鍥涘悜绌挎杞﹀繖瑁呭～
private String busyStatus = "-";
@@ -101,11 +98,6 @@
private String statusErrorCode;
/**
- * 閿欒淇℃伅鐮佹灇涓�
- */
- private ShuttleErrorCodeType errorCodeType;
-
- /**
* PLC杈撳叆鐘舵��
*/
private Short plcInputStatus;
@@ -128,7 +120,7 @@
/**
* 褰撳墠鐨勭數鍘嬪��
*/
- private Double currentVoltage;
+ private Integer currentVoltage;
/**
* 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -165,21 +157,6 @@
*/
public String loca = "-";
- public String getErrorCode$() {
- if(this.errorCodeType == null) return null;
- return this.errorCodeType.desc;
- }
-
- public void setErrorCode(Short errorCode) {
- this.errorCode = ShuttleErrorCodeType.get(errorCode.intValue()).desc;
- this.errorCodeType = ShuttleErrorCodeType.get(errorCode.intValue());
- }
-
- public void setErrorCode(ShuttleErrorCodeType type) {
- this.errorCode = type.desc;
- this.errorCodeType = type;
- }
-
public String getPlcOutputLift$() {
if (this.plcOutputLift == null) {
return null;
@@ -208,4 +185,18 @@
return this.plcOutputCharge ? "Y" : "N";
}
+ public String getStatus$() {
+ if (this.status == null) {
+ return ShuttleProtocolStatusType.OFFLINE.desc;
+ }
+ return ShuttleProtocolStatusType.get(this.status).desc;
+ }
+
+ public String getCurrentVoltage$() {
+ if (this.currentVoltage == null) {
+ return "";
+ }
+ return (this.currentVoltage / 1000.0) + "V";
+ }
+
}
--
Gitblit v1.9.1