#

luxiaotao1123

2024-11-15 8e6a6ee229b8a14ec3cac6b428921cbde8dcf53d

#

 zy-acs-flow/src/map/tool.js

@@ -684,6 +684,7 @@
        agvSprite.position.set(codeSprite.position.x, codeSprite.position.y);
        agvSprite.rotation = targetRotation + agvRotationOffset;
        mapContainer.addChild(agvSprite);
        console.log(agvSprite, setCurSprite);
        beInsight(agvSprite, setCurSprite);

        // agvNo sprite

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java

@@ -112,13 +112,13 @@
                if (null == endCode) {
                    return R.error();
                }
                if (!mainLockWrapService.buildMinorTask(agv, agvDetail, param.getTaskMode(), endCode.getData())) {
                if (!mainLockWrapService.buildMinorTask(agv, param.getTaskMode(), endCode.getData(), null)) {
                    return R.error();
                }
                break;
            case TO_CHARGE:
            case TO_STANDBY:
                if (!mainLockWrapService.buildMinorTask(agv, agvDetail, param.getTaskMode(), null)) {
                if (!mainLockWrapService.buildMinorTask(agv, param.getTaskMode(), null, null)) {
                    return R.error();
                }
                break;

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java

@@ -81,7 +81,7 @@
                    continue;
                }

                mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
                mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_CHARGE, null, null);
            }
        }
    }
@@ -144,7 +144,7 @@
                }
//            }

            mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
            mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_STANDBY, null, null);
        }
    }


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

@@ -2,7 +2,7 @@

import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Jam;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskTypeType;
import lombok.extern.slf4j.Slf4j;
@@ -46,7 +46,7 @@
        }
    }

    public boolean buildMinorTask(Agv agv, AgvDetail agvDetail, TaskTypeType taskType, String destination) {
    public boolean buildMinorTask(Agv agv, TaskTypeType taskType, String destination, Jam jam) {
        boolean lockAcquired = false;
        try {
            if (!(lockAcquired = this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS))) {
@@ -54,7 +54,7 @@
            }
//            log.info("buildMinorTask AGV[{}] lock time: {}", agv.getUuid(), System.currentTimeMillis());

            return mainService.buildMinorTask(agv, agvDetail, taskType, destination);
            return mainService.buildMinorTask(agv, taskType, destination, jam);
        } catch (Exception e) {
            log.error("MainLockWrapService.buildMinorTask[task]", e);
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

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

@@ -491,12 +491,10 @@
     * 充电 回待机位任务
     */
    @Transactional(propagation = Propagation.REQUIRES_NEW) // although there is a Transactional here that the lock is isolated, but we can't join the caller's Transactional
    public boolean buildMinorTask(Agv agv, AgvDetail agvDetail, TaskTypeType taskType, String destination) {
    public boolean buildMinorTask(Agv agv, TaskTypeType taskType, String destination, Jam jam) {
        if (Cools.isEmpty(agv, taskType)) { return false; }
        try {
            if (null == agvDetail) {
                agvDetail = agvDetailService.selectByAgvId(agv.getId());
            }
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            if (!agvService.judgeEnable(agv.getId())) {
                return false;
            }
@@ -602,6 +600,10 @@
                }
                if (!segmentService.save(next)) {
                    throw new BusinessException("segment failed to save");
                } else {
                    if (null != jam && i == 0) {
                        jam.setAvoSeg(next.getId());
                    }
                }
            }


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

@@ -84,7 +84,7 @@
        if (null == destinationCode) {
            return;
        }
        if (mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.MOVE, destinationCode.getData())) {
        if (mainLockWrapService.buildMinorTask(agv, TaskTypeType.MOVE, destinationCode.getData(), null)) {
            log.info(agv.getUuid() + "开始走行演示...");
        }
    }

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

@@ -453,11 +453,13 @@
            if (!segmentService.save(insertSeg)) {
                log.error("Segment [{}] 保存失败 ！！！", segment.getTravelId() + " - " + segment.getSerial());
                return false;
            } else {
                jam.setAvoSeg(insertSeg.getId());
            }

        } else {

            return mainLockWrapService.buildMinorTask(agv, null, TaskTypeType.MOVE, endCodeData);
            return mainLockWrapService.buildMinorTask(agv, TaskTypeType.MOVE, endCodeData, jam);
        }

        return true;