#
luxiaotao1123
2024-12-30 adaf4e51f496b069feb39866149fb404d12b96de
#
5个文件已修改
18 ■■■■ 已修改文件
zy-acs-flow/src/map/constants.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
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;
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]);
                        }
                    }
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 {
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;
    }
}