From 95d473bc8c09ef41e1455f93dec49c5ee6ac548f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 18 六月 2024 08:23:38 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
index 74060d0..8869609 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
@@ -10,6 +10,7 @@
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.common.ExecuteSupport;
+import com.zy.asrs.wcs.core.domain.dto.BasLiftStaDto;
import com.zy.asrs.wcs.core.entity.BasLift;
import com.zy.asrs.wcs.core.model.command.LiftCommand;
import com.zy.asrs.wcs.core.model.enums.LiftCommandModeType;
@@ -39,7 +40,7 @@
private LiftProtocol liftProtocol;
private SiemensS7Net siemensS7Net;
private List<LiftStaProtocol> liftStaProtocols = new ArrayList<>();
- private List<Sta> staList = new ArrayList<>();
+ private List<BasLiftStaDto> staList = new ArrayList<>();
public NyLiftThread(Device device, RedisUtil redisUtil) {
this.device = device;
@@ -49,9 +50,9 @@
BasLiftService basLiftService = SpringUtils.getBean(BasLiftService.class);
BasLift basLift = basLiftService.getOne(new LambdaQueryWrapper<BasLift>()
.eq(BasLift::getDeviceId, device.getId()));
- List<Sta> staList = JSON.parseArray(basLift.getSta(), Sta.class);
+ List<BasLiftStaDto> staList = JSON.parseArray(basLift.getSta(), BasLiftStaDto.class);
this.staList = staList;
- for (Sta sta : staList) {
+ for (BasLiftStaDto sta : staList) {
LiftStaProtocol liftStaProtocol = new LiftStaProtocol();
liftStaProtocol.setStaNo(sta.getStaNo());//绔欑偣鍙�
liftStaProtocol.setLev(sta.getLev());//绔欑偣妤煎眰
@@ -494,23 +495,6 @@
* 鎻愬崌鏈哄彿
*/
private Integer liftNo;
-
- }
-
- @Data
- public static class Sta {
-
- // 鎻愬崌鏈虹珯鐐瑰彿
- private Integer staNo;
-
- //杈撻�佺珯鐐规帓
- private Integer row;
-
- //杈撻�佺珯鐐瑰垪
- private Integer bay;
-
- // 灞�
- private Integer lev;
}
--
Gitblit v1.9.1