#

vincentlu

4 天以前 1ce8c694a364916fa45c60cabedb7a9215003055

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

@@ -2,13 +2,14 @@

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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import com.zy.acs.common.utils.News;

import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -37,7 +38,7 @@
            mainService.buildMajorTask(agvId, taskList);
        } catch (Exception e) {

            log.error("MainLockWrapService.buildMajorTask[task]", e);
            News.error("MainLockWrapService.buildMajorTask[task]", e);
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        } finally {
            if (lockAcquired) {
@@ -46,17 +47,17 @@
        }
    }

    public boolean buildMinorTask(Agv agv, AgvDetail agvDetail, TaskTypeType taskType, String destination) {
    public boolean buildMinorTask(Long agvId, TaskTypeType taskType, String destination, Jam jam) {
        boolean lockAcquired = false;
        try {
            if (!(lockAcquired = this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS))) {
                throw new CoolException("failed to generate [minor task] actions, cause can not acquire lock ...");
            }
//            log.info("buildMinorTask AGV[{}] lock time: {}", agv.getUuid(), System.currentTimeMillis());
//            News.info("buildMinorTask AGV[{}] lock time: {}", agv.getUuid(), System.currentTimeMillis());

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

            return false;
@@ -65,8 +66,8 @@
            if (lockAcquired) {
                this.lock.unlock();
            }
//            log.info("buildMinorTask AGV[{}] unlock time: {}", agv.getUuid(), System.currentTimeMillis());
//            News.info("buildMinorTask AGV[{}] unlock time: {}", agv.getUuid(), System.currentTimeMillis());
        }
    }

}
}