1

zhang

2025-06-17 bc64b3b45cf00885696aea4cfa97230390717012

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

@@ -1,7 +1,6 @@
package com.zy.acs.manager.core.service;

import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.Jam;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskTypeType;
@@ -25,7 +24,7 @@
    private final ReentrantLock lock = new ReentrantLock(Boolean.TRUE);

    @Autowired
    private MainService mainService;
    private MainLxtService mainService;

    public void buildMajorTask(Long agvId, List<Task> taskList) {
        boolean lockAcquired = false;
@@ -46,7 +45,7 @@
        }
    }

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

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