From 1983e747ee2368186cef348fd31e9e5163f56634 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 24 七月 2023 13:53:29 +0800
Subject: [PATCH] liftUpdate

---
 src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java |   62 ++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java
index 3a43152..b29c880 100644
--- a/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.domain.vo;
 
+import com.zy.core.enums.LiftNotReadyType;
 import com.zy.core.enums.LiftProtocolStatusType;
 import lombok.Data;
 
@@ -17,7 +18,7 @@
     /**
      * 褰撳墠鎻愬崌鏈虹姸鎬侊紙鍐呴儴鑷垜缁存姢锛�
      */
-    private String protocolStatus;
+    private Integer protocolStatus;
 
     /**
      * 鎻愬崌鏈洪攣瀹�
@@ -161,63 +162,122 @@
     private Boolean pakMk = true;
 
     public String getLiftLock$() {
+        if (this.liftLock == null) {
+            return "N";
+        }
         return this.liftLock ? "Y" : "N";
     }
 
     public String getReady$() {
+        if (this.ready == null) {
+            return "N";
+        }
         return this.ready ? "Y" : "N";
     }
 
+    public String getNotReady$() {
+        if (this.notReady == null) {
+            return "-";
+        }
+        return LiftNotReadyType.get((int) this.notReady).desc;
+    }
+
     public String getRunning$() {
+        if (this.running == null) {
+            return "N";
+        }
         return this.running ? "Y" : "N";
     }
 
     public String getMode$() {
+        if (this.mode == null) {
+            return "N";
+        }
         return this.mode ? "Y" : "N";
     }
 
     public String getLineFrontHasStock$() {
+        if (this.lineFrontHasStock == null) {
+            return "N";
+        }
         return this.lineFrontHasStock ? "Y" : "N";
     }
 
     public String getForwardRotationFeedback$() {
+        if (this.forwardRotationFeedback == null) {
+            return "N";
+        }
         return this.forwardRotationFeedback ? "Y" : "N";
     }
 
     public String getReverseFeedback$() {
+        if (this.reverseFeedback == null) {
+            return "N";
+        }
         return this.reverseFeedback ? "Y" : "N";
     }
 
     public String getMotorOverload$() {
+        if (this.motorOverload == null) {
+            return "N";
+        }
         return this.motorOverload ? "Y" : "N";
     }
 
     public String getLineEndHasStock$() {
+        if (this.lineEndHasStock == null) {
+            return "N";
+        }
         return this.lineEndHasStock ? "Y" : "N";
     }
 
     public String getInConveyLineCardTrayAlarm$() {
+        if (this.inConveyLineCardTrayAlarm == null) {
+            return "N";
+        }
         return this.inConveyLineCardTrayAlarm ? "Y" : "N";
     }
 
     public String getOutConveyLineCardTrayAlarm$() {
+        if (this.outConveyLineCardTrayAlarm == null) {
+            return "N";
+        }
         return this.outConveyLineCardTrayAlarm ? "Y" : "N";
     }
 
     public String getPlatPositionDeviationAlarm$() {
+        if (this.platPositionDeviationAlarm == null) {
+            return "N";
+        }
         return this.platPositionDeviationAlarm ? "Y" : "N";
     }
 
     public String getPlatTorqueDeviationAlarm$() {
+        if (this.platTorqueDeviationAlarm == null) {
+            return "N";
+        }
         return this.platTorqueDeviationAlarm ? "Y" : "N";
     }
 
     public String getPlatShuttleCheck$() {
+        if (this.platShuttleCheck == null) {
+            return "N";
+        }
         return this.platShuttleCheck ? "Y" : "N";
     }
 
     public String getPakMk$() {
+        if (this.pakMk == null) {
+            return "N";
+        }
         return this.pakMk ? "Y" : "N";
     }
 
+    public String getProtocolStatus$() {
+        if (this.protocolStatus == null) {
+            return LiftProtocolStatusType.OFFLINE.desc;
+        }
+        return LiftProtocolStatusType.get(this.protocolStatus).desc;
+    }
+
 }

--
Gitblit v1.9.1