#

luxiaotao1123

2024-12-16 8f6146d47a181f9353a5c06a65ac92baf4625e4a

#

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

@@ -105,23 +105,12 @@

            long startTime = System.currentTimeMillis();

            Resource codeMatrixResource = new ClassPathResource("codeMatrix.txt");
            Resource cdaMatrixResource = new ClassPathResource("cdaMatrix.txt");

            File codeMatrixFile = codeMatrixResource.getFile();
            File cdaMatrixFile = cdaMatrixResource.getFile();

            String codeMatrixPath = codeMatrixFile.getAbsolutePath();
            String cdaMatrixPath = cdaMatrixFile.getAbsolutePath();

            Resource resource = new ClassPathResource("agv.py");
            File file = resource.getFile();
            ProcessBuilder processBuilder = new ProcessBuilder(
                    "python"
                    , file.getAbsolutePath()
                    , String.valueOf(avoidDistance)
                    , codeMatrixPath
                    , cdaMatrixPath
                    , redisProperties.getHost()
                    , redisProperties.getPassword()
                    , String.valueOf(redisProperties.getPort())

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

@@ -29,7 +29,7 @@

    private final RedisSupport redis = RedisSupport.defaultRedisSupport;

    public static final Boolean CACHE_CODE_MATRIX = Boolean.FALSE;
    public static final Boolean CACHE_CODE_MATRIX = Boolean.TRUE;

    private String[][] codeMatrix;

@@ -41,7 +41,7 @@

    private int[][] turnMatrix;

    public static final Boolean CACHE_CDA_MATRIX = Boolean.FALSE;
    public static final Boolean CACHE_CDA_MATRIX = Boolean.TRUE;

    private String[][] cdaMatrix;