From 8f6146d47a181f9353a5c06a65ac92baf4625e4a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 16 十二月 2024 15:04:44 +0800
Subject: [PATCH] #
---
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/service/AvoidWaveCalculator.java | 11 -----------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
index 243f30f..a293cf0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
+++ b/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())
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 b4e5e50..d047a74 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
@@ -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;
--
Gitblit v1.9.1