From 4e9d40cece4d7ab340994a3fea2374e3309c4ba8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 三月 2023 08:43:54 +0800
Subject: [PATCH] 错误码枚举

---
 src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java |   22 ++++++++++++++++++++++
 src/main/java/com/zy/asrs/controller/ShuttleController.java   |    2 +-
 2 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 38b1212..01ef21f 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -73,7 +73,7 @@
             vo.setBatteryPower(shuttleProtocol.getBatteryPower$() == null ? "" : shuttleProtocol.getBatteryPower$() + "%");//鐢垫睜鐢甸噺
             vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() == null ? "" : shuttleProtocol.getBatteryTemp$() + "掳");//鐢垫睜娓╁害
             if (!Cools.isEmpty(shuttleProtocol.getErrorCode())) {
-//                vo.setErrorCode(shuttleProtocol.getErrorCodeType().desc);//閿欒缂栧彿
+                vo.setErrorCode(shuttleProtocol.getErrorCodeType().desc);//閿欒缂栧彿
             }
             vo.setPlcOutputStatusIO(shuttleProtocol.getPlcOutputStatusIO());//Plc杈撳嚭鐘舵�両O
             if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index 029e9e2..401c763 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -1,5 +1,6 @@
 package com.zy.core.model.protocol;
 
+import com.zy.core.enums.ShuttleErrorCodeType;
 import com.zy.core.enums.ShuttleProtocolStatusType;
 import com.zy.core.enums.ShuttleStatusType;
 import com.zy.core.model.command.ShuttleAssignCommand;
@@ -80,6 +81,11 @@
      * 閿欒缂栧彿
      */
     private Short errorCode;
+
+    /**
+     * 閿欒缂栧彿鏋氫妇
+     */
+    private ShuttleErrorCodeType errorCodeType;
 
     /**
      * Plc杈撳嚭鐘舵�両O
@@ -258,4 +264,20 @@
         this.protocolStatusType = status;
     }
 
+    /**
+     * 璁剧疆閿欒缂栧彿
+     */
+    public void setErrorCode(Short errorCode) {
+        this.errorCode = errorCode;
+        this.errorCodeType = ShuttleErrorCodeType.get(errorCode.intValue());
+    }
+
+    /**
+     * 璁剧疆閿欒缂栧彿
+     */
+    public void setErrorCode(ShuttleErrorCodeType type) {
+        this.errorCode = type.id.shortValue();
+        this.errorCodeType = type;
+    }
+
 }

--
Gitblit v1.9.1