From 8c7b4949dfcf875cc537304d34a7f6960cbb0c10 Mon Sep 17 00:00:00 2001
From: qlsxk <qlsxk@qq.com>
Date: 星期四, 16 十月 2025 14:57:12 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java |   88 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java b/src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java
index fdbaa2a..36a6e91 100644
--- a/src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java
@@ -1,11 +1,14 @@
 package com.zy.core.model.protocol;
 
+import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.entity.BasLiftErr;
 import com.zy.asrs.service.BasLiftErrService;
+import com.zy.common.utils.RedisUtil;
 import com.zy.core.enums.ForkLiftIoModeType;
 import com.zy.core.enums.ForkLiftProtocolStatusType;
 import com.zy.core.enums.ForkLiftTaskModeType;
+import com.zy.core.enums.RedisKeyType;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
@@ -22,7 +25,7 @@
     private Integer liftNo;
 
     /**
-     * 妯″紡0鍗曟満 1鑱旀満
+     * 妯″紡0鎵嬪姩 1鍗曟満 2鑱旀満
      */
     private Integer model;
 
@@ -30,6 +33,11 @@
      * 浠诲姟鍙�
      */
     private Integer taskNo = 0;
+
+    /**
+     * PLC浠诲姟鍙�
+     */
+    private Integer wrkNo;
 
     /**
      * 浠诲姟鐘舵��
@@ -44,7 +52,7 @@
     /**
      * 浠诲姟妯″紡
      */
-    private Integer mode = ForkLiftTaskModeType.NONE.id;
+    private Integer taskMode = ForkLiftTaskModeType.NONE.id;
 
     /**
      * 浠诲姟妯″紡鏋氫妇
@@ -75,6 +83,11 @@
      * 鏁呴殰鐮�
      */
     private Integer errorCode;
+
+    /**
+     * 褰撳墠灞�
+     */
+    private Integer lev;
 
     /**
      * 浣滀笟鏍囪
@@ -115,17 +128,17 @@
     /**
      * 璁剧疆浠诲姟妯″紡
      */
-    public void setMode(Integer mode) {
-        this.mode = mode;
-        this.modeType = ForkLiftTaskModeType.get(mode);
+    public void setTaskMode(Integer taskMode) {
+        this.taskMode = taskMode;
+        this.modeType = ForkLiftTaskModeType.get(taskMode);
     }
 
     /**
      * 璁剧疆浠诲姟妯″紡
      */
-    public void setMode(ForkLiftTaskModeType mode) {
-        this.mode = mode.id;
-        this.modeType = mode;
+    public void setMode(ForkLiftTaskModeType taskMode) {
+        this.taskMode = taskMode.id;
+        this.modeType = taskMode;
     }
 
     /**
@@ -159,6 +172,65 @@
         return basLiftErr.getErrName();
     }
 
+    public Integer getTaskNo() {
+        RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+        if (null != redisUtil) {
+            Object o = redisUtil.get(RedisKeyType.FORK_LIFT_FLAG.key + this.liftNo);
+            if (!Cools.isEmpty(o)) {
+                this.taskNo = Integer.parseInt(String.valueOf(o));
+            }
+        }
+        return this.taskNo == null ? 0 : this.taskNo;
+    }
+
+    public synchronized void setSyncTaskNo(Integer taskNo) {
+        RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+        if (null != redisUtil) {
+            redisUtil.set(RedisKeyType.FORK_LIFT_FLAG.key + this.liftNo, taskNo);
+            this.taskNo = taskNo;
+        }
+    }
+
+    public String getModel$() {
+        if (this.model == null) {
+            return "";
+        }
+
+        String name = "";
+        if (this.model == 0) {
+            name = "鎵嬪姩";
+        } else if (this.model == 1) {
+            name = "鍗曟満";
+        }else if (this.model == 2) {
+            name = "鑱旀満";
+        }
+        return name;
+    }
+
+    public String getProtocolStatus$() {
+        if (this.protocolStatus == null) {
+            return "";
+        }
+
+        return ForkLiftProtocolStatusType.get(this.protocolStatus).desc;
+    }
+
+    public String getTaskMode$() {
+        if (this.taskMode == null) {
+            return "";
+        }
+
+        return ForkLiftTaskModeType.get(this.taskMode).desc;
+    }
+
+    public String getIOMode$() {
+        if (this.iOMode == null) {
+            return "";
+        }
+
+        return ForkLiftIoModeType.get(this.iOMode).desc;
+    }
+
     @Override
     public ForkLiftProtocol clone() {
         try {

--
Gitblit v1.9.1