#
luxiaotao1123
2024-12-24 9790d057039546794c6cc30efdb8e09497c57096
#
2个文件已修改
27 ■■■■■ 已修改文件
zy-acs-manager/pom.xml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/pom.xml
@@ -147,14 +147,14 @@
        </dependency>
        <!-- nd4j -->
        <dependency>
            <groupId>org.nd4j</groupId>
            <artifactId>nd4j-native-platform</artifactId>
            <!-- java 8 -->
<!--            <version>1.0.0-M1.1</version>-->
            <!-- java 11 -->
            <version>1.0.0-M2.1</version>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>org.nd4j</groupId>-->
<!--            <artifactId>nd4j-native-platform</artifactId>-->
<!--            &lt;!&ndash; java 8 &ndash;&gt;-->
<!--&lt;!&ndash;            <version>1.0.0-M1.1</version>&ndash;&gt;-->
<!--            &lt;!&ndash; java 11 &ndash;&gt;-->
<!--            <version>1.0.0-M2.1</version>-->
<!--        </dependency>-->
    </dependencies>
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -20,6 +20,7 @@
import com.zy.acs.manager.manager.enums.SegmentStateType;
import com.zy.acs.manager.manager.enums.TaskTypeType;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -65,7 +66,7 @@
    @Autowired
    private RetreatNavigateService retreatNavigateService;
    @Autowired
    private TaskService taskService;
    private ConfigService configService;
    @Autowired
    private JamService jamService;
    @Autowired
@@ -75,6 +76,14 @@
    public synchronized void trigger(Segment segment) {
        try {
            Date now = new Date();
            // temporary -----------------
            Integer algoExtensionTime = configService.getVal("algoExtensionTime", Integer.class);
            if (null != algoExtensionTime && algoExtensionTime > 0) {
                Thread.sleep(algoExtensionTime);
            }
            // ---------------------------
            Travel travel = travelService.getById(segment.getTravelId());
            Agv agv = agvService.getById(travel.getAgvId());
            AgvDetail agvDetail = agvDetailService.selectByAgvId(travel.getAgvId());