#

luxiaotao1123

2024-10-19 00b0ec55e1b0eef82b3a31166e8273ecea776568

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java

@@ -13,6 +13,7 @@
import com.zy.acs.manager.common.domain.MapDto;
import com.zy.acs.manager.common.domain.MapRouteDto;
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.core.domain.BackpackDto;
import com.zy.acs.manager.core.service.MapService;
import com.zy.acs.manager.core.service.floyd.FloydNavigateService;
import com.zy.acs.manager.manager.controller.param.MapDataParam;
@@ -21,6 +22,7 @@
import com.zy.acs.manager.manager.entity.Map;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.AgvStsType;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.mapper.MapMapper;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.controller.BaseController;
@@ -31,6 +33,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.stream.Collectors;

/**
 * Created by vincent on 2023/6/1
@@ -54,13 +57,22 @@
    @Autowired
    private MapService mapService;
    @Autowired
    private ConfigService configService;
    private TaskService taskService;
    @Autowired
    private MapMapper mapMapper;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private LocService locService;
    @Autowired
    private ConfigService configService;

    @PreAuthorize("hasAuthority('manager:loc:update')")
    @PostMapping("/startupOrShutdown")
    public synchronized R startupOrShutdown() {
        Boolean taskAssignMode = configService.getVal("TaskAssignMode", Boolean.class);
        return configService.setVal("TaskAssignMode", !taskAssignMode) ? R.ok() : R.error();
    }

    @PreAuthorize("hasAuthority('manager:loc:list')")
    @PostMapping("/data/fetch")
@@ -80,6 +92,7 @@
        // common
        Map activeMap = mapMapper.selectActive(zoneId, floor);
        return R.ok().add(Cools
                .add("rcsStatus", configService.getVal("TaskAssignMode", Boolean.class))
                .add("point", GsonUtils.toJson(mapCodeItems))
                .add("common", activeMap.getData())
        );
@@ -133,7 +146,23 @@
        Agv agv = agvService.selectByUuid(agvNo);
        AgvDetail agvDetail = agvDetailService.selectByAgvNo(agvNo);
        MapAgvVo vo = new MapAgvVo();
        vo.setAgvId(agv.getId());
        vo.setAgvNo(agv.getUuid());
        vo.setStatus(agv.getStatus());
        if (null != agvDetail) {
            vo.setOnline(agvService.judgeOnline(agvDetail.getAgvId()));
            vo.setAgvStatus(agvDetail.getStatusDesc());
            vo.setVol(String.valueOf(agvDetail.getVol()));
            vo.setSoc(String.valueOf(agvDetail.getSoc()));
            vo.setPos(agvDetail.getPos() != null && agvDetail.getPos() == 1);
            vo.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
            vo.setDirection(agvDetail.getAgvAngle());
            vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
        }
        List<Task> tasks = taskService.selectInSts(agv.getId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
        if (!Cools.isEmpty(tasks)) {
            vo.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
        }
        return R.ok().add(vo);
    }