zhang
2025-05-20 1313906bb1eb983d3beece810035e7fc28d6a92f
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -13,16 +13,16 @@
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.service.PatrolService;
import com.zy.acs.manager.core.domain.BackpackDto;
import com.zy.acs.manager.core.service.AvoidWaveCalculator;
import com.zy.acs.manager.core.service.MapService;
import com.zy.acs.manager.core.service.PatrolService;
import com.zy.acs.manager.core.service.floyd.FloydNavigateService;
import com.zy.acs.manager.manager.controller.param.MapDataParam;
import com.zy.acs.manager.manager.controller.param.MapParam;
import com.zy.acs.manager.manager.controller.result.MapAgvVo;
import com.zy.acs.manager.manager.controller.result.MapPointVo;
import com.zy.acs.manager.manager.controller.result.MapRouteVo;
import com.zy.acs.manager.manager.entity.NavMap;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.AgvStsType;
import com.zy.acs.manager.manager.enums.StatusType;
@@ -72,6 +72,8 @@
    private ConfigService configService;
    @Autowired
    private PatrolService patrolService;
    @Autowired
    private AvoidWaveCalculator avoidWaveCalculator;
    @PreAuthorize("hasAuthority('manager:loc:update')")
    @PostMapping("/startupOrShutdown")
@@ -161,7 +163,7 @@
            vo.setVol(String.valueOf(agvDetail.getVol()));
            vo.setSoc(String.valueOf(agvDetail.getSoc()));
            vo.setPos(agvDetail.getPos() != null && agvDetail.getPos() == 1);
            Code code = codeService.getById(agvDetail.getRecentCode());
            Code code = codeService.getCacheById(agvDetail.getRecentCode());
            if (null != code) {
                vo.setCode(code.getData());
            }
@@ -427,7 +429,7 @@
        for (Agv agv : agvList) {
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            if (null == agvDetail) { continue; }
            Code currCode = codeService.getById(agvDetail.getCode());
            Code currCode = codeService.getCacheById(agvDetail.getCode());
            MapAgvDto agvDto = new MapAgvDto();
            agvDto.setUuid(agv.getUuid());
            agvDto.setCurrCode(currCode==null?null:currCode.getData());