From 429bc159b230ed31092aed3b8c4893c20e52f5c6 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 16 三月 2024 15:47:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
index dcee8b0..9a607af 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -1,5 +1,8 @@
package com.zy.core.model.protocol;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasLiftErr;
+import com.zy.asrs.service.BasLiftErrService;
import com.zy.core.enums.LiftProtocolStatusType;
import com.zy.core.model.command.LiftAssignCommand;
import lombok.Data;
@@ -93,6 +96,11 @@
private Boolean deviceError;
/**
+ * 鏁呴殰鐮�
+ */
+ private Short errorCode;
+
+ /**
* 浠诲姟鍦板潃
*/
private Short taskAddress;
@@ -128,6 +136,16 @@
* 浠诲姟鍛戒护
*/
private LiftAssignCommand assignCommand;
+
+ /**
+ * 鎸囦护涓嬪彂鏃堕棿
+ */
+ private Long sendTime = 0L;
+
+ /**
+ * 鏃ュ織閲囬泦鏃堕棿
+ */
+ private Long deviceDataLog = System.currentTimeMillis();
/**
* 璁剧疆鎻愬崌鏈虹姸鎬�
@@ -209,5 +227,17 @@
return res;
}
+ public String getErrCode$() {
+ if (this.errorCode == null) {
+ return "";
+ }
+ BasLiftErrService basLiftErrService = SpringUtils.getBean(BasLiftErrService.class);
+ BasLiftErr basLiftErr = basLiftErrService.selectById(this.errorCode);
+ if (basLiftErr == null) {
+ return String.valueOf(this.errorCode);
+ }
+ return basLiftErr.getErrName();
+ }
+
}
--
Gitblit v1.9.1