From fd5d26ae0d1dbf71f90b99ef84d09a34e2d10d83 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期二, 07 一月 2025 10:45:50 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 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..9d6ecb5 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; @@ -30,6 +33,11 @@ * 浠诲姟鍙� */ private Integer taskNo = 0; + + /** + * PLC浠诲姟鍙� + */ + private Integer wrkNo; /** * 浠诲姟鐘舵�� @@ -159,6 +167,25 @@ 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; + } + } + @Override public ForkLiftProtocol clone() { try { -- Gitblit v1.9.1