#

luxiaotao1123

2024-12-03 b8571f010ee3dec5e6cbab95f634082eefce22a8

 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.service.PatrolService;
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;
@@ -68,6 +69,8 @@
    private LocService locService;
    @Autowired
    private ConfigService configService;
    @Autowired
    private PatrolService patrolService;

    @PreAuthorize("hasAuthority('manager:loc:update')")
    @PostMapping("/startupOrShutdown")
@@ -160,6 +163,11 @@
            vo.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
            vo.setDirection(agvDetail.getAgvAngle());
            vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
            vo.setPatrol(patrolService.isPatrolling(agvNo));
            String error = agvDetail.realError();
            if (!Cools.isEmpty(error)) {
                vo.setError(error);
            }
        }
        List<Task> tasks = taskService.selectInSts(agv.getId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
        if (!Cools.isEmpty(tasks)) {