#

vincentlu

2025-01-10 f2631e786cc1c939e0a0698eadee76fd3d9a1fa9

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

@@ -3,17 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.enums.TaskTypeType;
import com.zy.acs.manager.manager.service.AgvDetailService;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.manager.enums.TravelStateType;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +29,7 @@
@Service
public class PatrolService {

    private static final int SCHEDULE_TIME_INTERVAL = 5;
    private static final int SCHEDULE_TIME_INTERVAL = 100;

    public static final Map<String, ScheduledFuture<?>> AGV_PATROL_MAP = new ConcurrentHashMap<>();

@@ -55,7 +50,7 @@
    @Autowired
    private MapService mapService;
    @Autowired
    private LaneService laneService;
    private TravelService travelService;
    @Autowired
    private AllocateService allocateService;
    @Autowired
@@ -66,20 +61,23 @@
    }

    private void patrolOfMove(String agvNo) {
        Agv agv = agvService.selectByUuid(agvNo);
        AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
        if (taskService.count(new LambdaQueryWrapper<Task>()
                .eq(Task::getAgvId, agv.getId())
                .and(i -> {
                    i.eq(Task::getTaskSts, TaskStsType.WAITING.val())
                            .or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
                            .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
                })) > 0) {
        Long agvId = agvService.getAgvId(agvNo);
        AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agvId);
        if (0 < travelService.count(new LambdaQueryWrapper<Travel>()
                .eq(Travel::getAgvId, agvId)
                .eq(Travel::getState, TravelStateType.RUNNING.toString()))) {
            return;
        }
        if (!agvService.judgeEnable(agv.getId())) {
//        if (taskService.count(new LambdaQueryWrapper<Task>()
//                .eq(Task::getAgvId, agvId)
//                .in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
//                ) > 0) {
//            return;
//        }
        if (!agvService.judgeEnable(agvId)) {
            return;
        }
        Agv agv = agvService.getById(agvId);
        Code destinationCode = this.getDestinationCode(agv, agvDetail);
        if (null == destinationCode) {
            return;
@@ -169,7 +167,7 @@
            }
        };

        ScheduledFuture<?> scheduledFuture = scheduler.scheduleAtFixedRate(patrolTask, 0, SCHEDULE_TIME_INTERVAL, TimeUnit.SECONDS);
        ScheduledFuture<?> scheduledFuture = scheduler.scheduleAtFixedRate(patrolTask, 0, SCHEDULE_TIME_INTERVAL, TimeUnit.MILLISECONDS);

        AGV_PATROL_MAP.put(agvNo, scheduledFuture);
        log.info("已启动AGV " + agvNo + " 的跑库任务。");