From d8dfba7b01fc1862c1ced514755e729bf65fec7e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 06 六月 2024 08:14:41 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 54c4852..f0fbe84 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -83,7 +83,7 @@
public synchronized void initRealtimeBasMap() {
try {
List<Dict> dicts = dictService.list(new LambdaQueryWrapper<Dict>()
- .like(Dict::getFlag, "map")
+ .like(Dict::getFlag, "map-")
.eq(Dict::getStatus, 1));
TreeMap<Integer, ArrayList<ArrayList<MapNode>>> levData = new TreeMap<>();
@@ -122,6 +122,8 @@
mapNode.setRow(object.getInteger("row"));
mapNode.setBay(object.getInteger("bay"));
mapNode.setNo(object.getString("row") + "-" + object.getString("bay"));
+ mapNode.setXBase(object.getInteger("refx"));
+ mapNode.setYBase(object.getInteger("refy"));
nodes.add(mapNode);
}
@@ -150,6 +152,8 @@
mapNode.setRow(0);
mapNode.setBay(0);
mapNode.setNo("0-0");
+ mapNode.setXBase(0);
+ mapNode.setYBase(0);
//鑾峰彇鏈�闀縭ow
int row = 0;
@@ -181,8 +185,11 @@
map.setUpdateTime(now);
map.setLev(lev);
- //灏嗗湴鍥炬暟鎹瓨鍏edis
- redisUtil.set(DeviceRedisConstant.MAP + lev, JSON.toJSONString(map));
+ Object data = redisUtil.get(DeviceRedisConstant.MAP + lev);
+ if (data != null) {
+ //灏嗗湴鍥炬暟鎹瓨鍏edis
+ redisUtil.set(DeviceRedisConstant.MAP + lev, JSON.toJSONString(map));
+ }
}
} catch (Exception e) {
e.printStackTrace();
@@ -442,6 +449,11 @@
continue;
}
+ ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+
if (!shuttleThread.isCharging()) {
continue;
}
--
Gitblit v1.9.1