#

vincentlu

3 小时以前 6cbb420754e6e29fa134a6afca4514b8dfd62918

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

@@ -87,6 +87,17 @@
    }

    @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')")
    @PostMapping("/data/fetch")
    public R fetch(@RequestParam(required = false) Long zoneId, @RequestParam(required = false) Integer floor) {
        // code
@@ -445,8 +456,7 @@
    @GetMapping("/area/get")
    public R areaGet(@RequestParam Long areaId) {
        Area area = areaService.getById(areaId);
        MapAreaResult areaResult = new MapAreaResult();
        return R.ok().add(areaResult.sync(area));
        return R.ok().add(new MapAreaResult().sync(area));
    }

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