#

luxiaotao1123

2024-12-18 78039785a656f5c8f130b4c199284256007772f5

#

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

@@ -102,13 +102,10 @@
            AgvModel agvModel = agvModelService.selectByType(AgvModelType.CTU_BOX_TRANSPORT_AGV.toString());    // can be optimized
            Double avoidDistance = MapDataUtils.getVehicleWaveSafeDistance(agvModel.getDiameter(), MapDataConstant.MAX_DISTANCE_BETWEEN_ADJACENT_AGV_FACTOR);

            long startTime = System.currentTimeMillis();

            Resource resource = new ClassPathResource("agv.py");

            File tempScript = null;

            try {
                InputStream is = resource.getInputStream();
                tempScript = File.createTempFile("agv", ".py");
                tempScript.deleteOnExit();
@@ -127,18 +124,6 @@
                );

                processBuilder.redirectErrorStream(true);

//            File file = resource.getFile();
//            ProcessBuilder processBuilder = new ProcessBuilder(
//                    "python"
//                    , file.getAbsolutePath()
//                    , String.valueOf(avoidDistance)
//                    , redisProperties.getHost()
//                    , redisProperties.getPassword()
//                    , String.valueOf(redisProperties.getPort())
//                    , String.valueOf(redisProperties.getIndex())
//            );
//            processBuilder.redirectErrorStream(true);

                Process process = processBuilder.start();

@@ -167,9 +152,6 @@
                    if (!"1".equals(result)) {
                        log.error("Failed to call python");
                    }
                }
            } catch (IOException | InterruptedException e) {
                e.printStackTrace();
            }
//            log.error("python finish {}", System.currentTimeMillis() - startTime);


 zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java

@@ -60,7 +60,7 @@
     * 4.AgvServiceImpl.judgeOnline
     * 5.
     */
//    @Scheduled(cron = "0/1 * * * * ? ")
    @Scheduled(cron = "0/1 * * * * ? ")
    public void process() {
        Boolean fakeSign = configService.getVal("fakeSign", Boolean.class);
        if (null == fakeSign || !fakeSign) {