From adaf4e51f496b069feb39866149fb404d12b96de Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 30 十二月 2024 09:35:33 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/constants.js | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java | 7 -------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 3 +--
5 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/zy-acs-flow/src/map/constants.js b/zy-acs-flow/src/map/constants.js
index 2f82f22..58869f5 100644
--- a/zy-acs-flow/src/map/constants.js
+++ b/zy-acs-flow/src/map/constants.js
@@ -1,5 +1,5 @@
-export const ANIMATE_DURING_TIME = 1000;
+export const ANIMATE_DURING_TIME = 300;
export const MAP_DEFAULT_ROTATION = 270;
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 19a8af3..3c7e5ab 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
@@ -33,7 +33,7 @@
@Component
public class MapDataWsScheduler {
- public static final int WEBSOCKET_BROADCAST_INTERVAL = 1000;
+ public static final int WEBSOCKET_BROADCAST_INTERVAL = 300;
private ExecutorService singleThreadExecutor;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
index cf74c9a..d98b6d3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
@@ -206,7 +206,6 @@
Integer serial = dynamicNode.getSerial();
- long time = dynamicNode.getTime();
List<String> resetCodeList = new ArrayList<>();
@@ -217,7 +216,7 @@
DynamicNode node = dynamicMatrix[i][j];
if (node.getVehicle().equals(agvNo)) {
- if (node.getSerial() < serial || node.getTime() != time) {
+ if (node.getSerial() < serial) {
resetCodeList.add(codeMatrix[i][j]);
}
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
index 04c462b..3ff5485 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
@@ -485,11 +485,11 @@
if (Cools.isEmpty(codeList, vehicle)) {
return;
}
- long time = System.currentTimeMillis() / 1000;
+// long time = System.currentTimeMillis() / 1000;
int serial = 1;
for (String code : codeList) {
int[] node = getCodeMatrixIdx(lev, code);
- dynamicMatrix[node[0]][node[1]] = new DynamicNode(vehicle, serial, time);
+ dynamicMatrix[node[0]][node[1]] = new DynamicNode(vehicle, serial);
serial++;
}
} else {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java
index 30e3d1f..7b46e3a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java
@@ -16,8 +16,6 @@
private Integer serial = -1;
- private long time = 0;
-
public DynamicNode() {}
public DynamicNode(String vehicle) {
@@ -29,9 +27,4 @@
this.serial = serial;
}
- public DynamicNode(String vehicle, Integer serial, long time) {
- this.vehicle = vehicle;
- this.serial = serial;
- this.time = time;
- }
}
--
Gitblit v1.9.1