#

vincentlu

38 分钟以前 6cbb420754e6e29fa134a6afca4514b8dfd62918

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

@@ -13,16 +13,18 @@
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.MapAreaParam;
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.MapAreaResult;
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,12 +74,27 @@
    private ConfigService configService;
    @Autowired
    private PatrolService patrolService;
    @Autowired
    private AvoidWaveCalculator avoidWaveCalculator;
    @Autowired
    private AreaService areaService;

    @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("/config/preferences")
    public R configPreferences(@RequestParam(required = false) Long zoneId, @RequestParam(required = false) Integer floor) {
        Integer dashboardAgvAngleOffsetVal = configService.getVal("dashboardAgvAngleOffsetVal", Integer.class);
        Boolean dashMapMirror = configService.getVal("dashMapMirror", Boolean.class);
        return R.ok().add(Cools
                .add("agvAngleOffsetVal", Optional.ofNullable(dashboardAgvAngleOffsetVal).orElse(0))
                .add("mapMirror", Optional.ofNullable(dashMapMirror).orElse(Boolean.FALSE))
        );
    }

    @PreAuthorize("hasAuthority('manager:loc:list')")
@@ -161,7 +178,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());
            }
@@ -209,22 +226,6 @@
        }
        return R.ok().add(result);
    }



















@@ -427,7 +428,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());
@@ -437,4 +438,44 @@
        return R.ok().add(mapDto);
    }

    // area operate -------------------------

    @PreAuthorize("hasAuthority('manager:loc:list')")
    @PostMapping("/area/list")
    public R areaFetch(@RequestParam(required = false) Long zoneId, @RequestParam(required = false) Integer floor) {
        List<Area> areaList = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getStatus, StatusType.ENABLE.val));
        List<MapAreaResult> list = new ArrayList<>();
        for (Area area : areaList) {
            MapAreaResult result = new MapAreaResult();
            list.add(result.sync(area));
        }
        return R.ok().add(list);
    }

    @PreAuthorize("hasAuthority('manager:loc:list')")
    @GetMapping("/area/get")
    public R areaGet(@RequestParam Long areaId) {
        Area area = areaService.getById(areaId);
        return R.ok().add(new MapAreaResult().sync(area));
    }

    @PreAuthorize("hasAuthority('manager:loc:update')")
    @PostMapping("/area/save")
    public R areaSave(@RequestBody MapAreaParam param) {
        return R.ok().add(areaService.saveMapArea(param, getLoginUserId()));
    }

    @PreAuthorize("hasAuthority('manager:loc:update')")
    @PostMapping("/area/update")
    public R areaUpdate(@RequestBody MapAreaParam param) {
        return R.ok().add(areaService.modifyMapArea(param, getLoginUserId()));
    }

    @PreAuthorize("hasAuthority('manager:loc:remove')")
    @PostMapping("/area/remove")
    public R areaRemove(@RequestBody MapAreaParam param) {
        areaService.removeMapArea(param.getId(), getLoginUserId());
        return R.ok();
    }

}