From de6a34c248036d65a3d6797c83e051acdeb78bf7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 21 十月 2024 15:18:33 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/constants.js | 2 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java | 2 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 6 ++++++
zy-acs-flow/src/map/tool.js | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
4 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/zy-acs-flow/src/map/constants.js b/zy-acs-flow/src/map/constants.js
index a88723d..192090a 100644
--- a/zy-acs-flow/src/map/constants.js
+++ b/zy-acs-flow/src/map/constants.js
@@ -26,6 +26,8 @@
AGV: 3,
POINT: 2,
+
+ DYNAMIC_ROUTE: 2,
})
export const DEVICE_SPRITE_TINT = Object.freeze({
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index c84c2ca..ade4711 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -500,7 +500,7 @@
const pointRoute = new PointRoute(POINT_ROUTE_DIRECTION[route.direction]);
pointRoute.setPoint(startPoint, endPoint);
pointRoute.clear();
- pointRoute.lineStyle(8, themeMode === 'light' ? '#2d3436' : '#dcdde1');
+ pointRoute.lineStyle(Math.max(7, 1.5 * (1 / mapContainer.scale.x)), themeMode === 'light' ? '#ced6e0' : '#535c68');
pointRoute.moveTo(startPoint.position.x, startPoint.position.y);
pointRoute.lineTo(endPoint.position.x, endPoint.position.y);
pointRoute.alpha = 1;
@@ -621,14 +621,16 @@
export const generateDynamicGraphic = (curZone, data, setCurSprite) => {
// console.log("ws", curZone, data);
- for (const agv of data.agvVos) {
- showAgvSprite(curZone, agv, setCurSprite)
+ for (const agvVo of data.agvVos) {
+ // console.log(agvVo);
+ showAgvSprite(curZone, agvVo, setCurSprite);
+ drawerAgvPath(curZone, agvVo);
}
}
-const showAgvSprite = (curZone, agv, setCurSprite) => {
- const { agvNo, code, direction, backpack, battery, ...rest } = agv;
+const showAgvSprite = (curZone, agvVo, setCurSprite) => {
+ const { agvNo, code, direction, backpack, dynamicRoute, battery, ...rest } = agvVo;
if (!code) { return }
const codeSprite = querySprite(DEVICE_TYPE.POINT, code);
if (!codeSprite) { return }
@@ -645,4 +647,41 @@
beInsight(agvSprite, setCurSprite);
// agv no on sprite
}
+}
+
+const drawerAgvPath = (curZone, agvVo) => {
+ if (!mapContainer) {
+ return;
+ }
+ const { agvNo, code: curCode, dynamicRoute } = agvVo;
+ if (dynamicRoute?.length <= 1) {
+ return;
+ }
+
+ const agvPathName = 'agvPath-' + agvNo;
+ let agvPath = mapContainer.getChildByName(agvPathName);
+ if (agvPath) {
+ mapContainer.removeChild(agvPath);
+ }
+ agvPath = new PIXI.Graphics();
+ agvPath.name = agvPathName;
+ agvPath.lineStyle(Math.max(20, 4 * (1 / mapContainer.scale.x)), 0x2f68ac, 0.8);
+ agvPath.zIndex = DEVICE_Z_INDEX.DYNAMIC_ROUTE;
+ agvPath.blendMode = PIXI.BLEND_MODES.NORMAL;
+
+ let firstNode = true;
+ for (let i = Math.max(0, dynamicRoute.indexOf(curCode)); i < dynamicRoute.length; i++) {
+ const node = dynamicRoute[i];
+ const codeSprite = querySprite(DEVICE_TYPE.POINT, node);
+ if (!codeSprite) { continue };
+ const { x, y } = codeSprite.position;
+ if (firstNode) {
+ agvPath.moveTo(x, y);
+ firstNode = false;
+ } else {
+ agvPath.lineTo(x, y);
+ }
+ }
+
+ mapContainer.addChild(agvPath);
}
\ No newline at end of file
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java
index c564eb3..182f1f3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java
@@ -19,6 +19,8 @@
private List<BackpackDto> backpack = new ArrayList<>();
+ private List<String> dynamicRoute = new ArrayList<>();
+
private Integer battery;
// public int getBackpackLoadedCount() {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
index 599a81d..ab38279 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
@@ -5,6 +5,7 @@
import com.zy.acs.manager.core.domain.BackpackDto;
import com.zy.acs.manager.core.domain.MapWsAgvVo;
import com.zy.acs.manager.core.domain.MapWsVo;
+import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
@@ -31,6 +32,8 @@
private AgvDetailService agvDetailService;
@Autowired
private CodeService codeService;
+ @Autowired
+ private MapDataDispatcher mapDataDispatcher;
@Scheduled(cron = "0/1 * * * * ? ")
public void broadcast() {
@@ -58,6 +61,9 @@
vo.setDirection(agvDetail.getAgvAngle());
vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
vo.setBattery(agvDetail.getSoc());
+
+ vo.setDynamicRoute(mapDataDispatcher.queryCodeListFromDynamicNode(null, agv.getUuid()));
+
agvVos.add(vo);
}
--
Gitblit v1.9.1