#
luxiaotao1123
2024-12-24 bec3e6f914dbbcc7f68421f1e520e35db3f17160
#
3个文件已修改
14 ■■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -119,12 +119,7 @@
                    for (Segment segment : segments) {
                        long startTime = System.currentTimeMillis();
                        trafficService.trigger(segment);
                        long algoTime = System.currentTimeMillis() - startTime;
                        log.info("traffic calculation spend {} ms", algoTime);
                        if (segment.getState().equals(SegmentStateType.RUNNING.toString())) {
                            segment.setAlgoTime((int) algoTime);
                            segmentService.updateById(segment);
                        }
                        log.info("traffic calculation spend {} ms", System.currentTimeMillis() - startTime);
                    }
                } catch (Exception e) {
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -641,7 +641,7 @@
     * 根据分片生成动作 ( 车辆可能已经做过一些任务了,正在等待下一段任务 )
     */
    @Transactional
    public synchronized void generateAction(Long agvId, List<Segment> segmentList, List<String> pathList) {
    public synchronized void generateAction(Long agvId, List<Segment> segmentList, List<String> pathList, Date algoStartTime) {
        try {
            if (Cools.isEmpty(agvId, segmentList)) { return; }
            Date now = new Date();
@@ -1010,6 +1010,9 @@
                item.setGroupId(groupId);
                item.setState(SegmentStateType.RUNNING.toString());
                item.setUpdateTime(now);
                if (null != algoStartTime) {
                    item.setAlgoTime((int) (now.getTime() - algoStartTime.getTime()));
                }
                if (!segmentService.updateById(item)) {
                    throw new CoolException("更新Segment失败");
                }
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -188,7 +188,7 @@
            mapService.lockPath(null, pathList, agv.getUuid());
            mainService.generateAction(segment.getAgvId(), segmentList, pathList);
            mainService.generateAction(segment.getAgvId(), segmentList, pathList, now);
        } catch (Exception e) {
            log.error("TrafficService.trigger", e);