#

vincentlu

1 天以前 60fda68af793008947c9b26950421a40363a73a2

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java

@@ -7,6 +7,7 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.utils.MapDataUtils;
import com.zy.acs.manager.core.domain.PathDto;
import com.zy.acs.manager.core.service.astart.domain.DynamicNode;
import com.zy.acs.manager.core.utils.RouteGenerator;
import com.zy.acs.manager.manager.entity.Code;
@@ -16,9 +17,9 @@
import com.zy.acs.manager.manager.service.RouteService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import java.util.*;

/**
@@ -51,7 +52,7 @@
    @Autowired
    private RouteService routeService;

    @EventListener(ApplicationReadyEvent.class)
    @PostConstruct
    public void init() {
        String[][] codeMatrix = this.getCodeMatrix(null);
        this.initRouteMap(null);
@@ -498,10 +499,18 @@
    }

    public void modifyDynamicMatrix(Integer lev, List<int[]> codeIdxList, String vehicle) {
        this.modifyDynamicMatrix(lev, codeIdxList, vehicle, false);
        this.modifyDynamicMatrix(lev, codeIdxList, vehicle, false, null);
    }

    public void modifyDynamicMatrix(Integer lev, List<int[]> codeIdxList, String vehicle, List<PathDto> pathTrace) {
        this.modifyDynamicMatrix(lev, codeIdxList, vehicle, false, pathTrace);
    }

    public synchronized void modifyDynamicMatrix(Integer lev, List<int[]> codeIdxList, String vehicle, boolean reset) {
        this.modifyDynamicMatrix(lev, codeIdxList, vehicle, reset, null);
    }

    private synchronized void modifyDynamicMatrix(Integer lev, List<int[]> codeIdxList, String vehicle, boolean reset, List<PathDto> pathTrace) {
        if (Cools.isEmpty(vehicle)) {
            return;
        }
@@ -509,10 +518,15 @@
        DynamicNode[][] dynamicMatrix = getDynamicMatrix(lev);

        if (!reset) {
//            long time = System.currentTimeMillis() / 1000;
            int serial = 1;
            for (int[] codeMatrixIdx : codeIdxList) {
                dynamicMatrix[codeMatrixIdx[0]][codeMatrixIdx[1]] = new DynamicNode(vehicle, serial);
            for (int i = 0; i < codeIdxList.size(); i++) {
                int[] codeMatrixIdx = codeIdxList.get(i);

                PathDto pathDto = (pathTrace != null && i < pathTrace.size()) ? pathTrace.get(i) : null;
                Double direction = pathDto == null ? null : pathDto.getDirection();
                boolean turn = pathDto != null && pathDto.isTurn();

                dynamicMatrix[codeMatrixIdx[0]][codeMatrixIdx[1]] = new DynamicNode(vehicle, serial, direction, turn);
                serial++;
            }
        } else {