Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

15 小时以前 70930071a49190f414c8d8bc9c9e9795a4096739

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

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

import com.zy.acs.common.utils.News;
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;
import com.zy.acs.manager.system.service.ConfigService;
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;
@@ -27,6 +27,8 @@

    @Autowired
    private MainService mainService;
    @Autowired
    private ConfigService configService;

    public void buildMajorTask(Long agvId, List<Task> taskList) {
        boolean lockAcquired = false;
@@ -53,7 +55,6 @@
            if (!(lockAcquired = this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS))) {
                throw new CoolException("failed to generate [minor task] actions, cause can not acquire lock ...");
            }
//            News.info("buildMinorTask AGV[{}] lock time: {}", agv.getUuid(), System.currentTimeMillis());

            return mainService.buildMinorTask(agvId, taskType, destination, jam);
        } catch (Exception e) {