zhou zhou
1 天以前 1dcfa3702505f0c431757312b5304531029f90f6
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -47,14 +47,13 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Warehouse, BaseParam> pageParam = new PageParam<>(baseParam, Warehouse.class);
        PageParam<Warehouse, BaseParam> page = warehouseService.page(pageParam, pageParam.buildWrapper(true));
        buildPageRowsUtils.userNameMap(page.getRecords());
        return R.ok().add(page);
        return R.ok().add(buildPageRowsUtils.rowsMap(page));
    }
    @PreAuthorize("hasAuthority('manager:warehouse:list')")
    @PostMapping("/warehouse/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(warehouseService.list());
        return R.ok().add(buildPageRowsUtils.rowsMap(warehouseService.list()));
    }
    @PreAuthorize("hasAuthority('manager:warehouse:list')")
@@ -68,19 +67,19 @@
            vo.setName(warehouse.getName());
            return vo;
        }).collect(Collectors.toList());
        return R.ok().add(warehouseList2);
        return R.ok().add(buildPageRowsUtils.rowsMap(warehouseList2));
    }
    @PreAuthorize("hasAuthority('manager:warehouse:list')")
    @PostMapping({"/warehouse/many/{ids}", "/warehouses/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(warehouseService.listByIds(Arrays.asList(ids)));
        return R.ok().add(buildPageRowsUtils.rowsMap(warehouseService.listByIds(Arrays.asList(ids))));
    }
    @PreAuthorize("hasAuthority('manager:warehouse:list')")
    @GetMapping("/warehouse/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(warehouseService.getById(id));
        return R.ok().add(buildPageRowsUtils.rowsMap(warehouseService.getById(id)));
    }
    @PreAuthorize("hasAuthority('manager:warehouse:save')")
@@ -106,7 +105,7 @@
        if (!warehouseService.save(warehouse)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(warehouse);
        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(warehouse));
    }
    @PreAuthorize("hasAuthority('manager:warehouse:update')")
@@ -139,7 +138,7 @@
        if (!warehouseService.updateById(warehouse)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(warehouse);
        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(warehouse));
    }
    @PreAuthorize("hasAuthority('manager:warehouse:remove')")
@@ -157,7 +156,7 @@
        if (!warehouseService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
        return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
    }
    @PreAuthorize("hasAuthority('manager:warehouse:list')")
@@ -171,7 +170,7 @@
        warehouseService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getName()))
        );
        return R.ok().add(vos);
        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
    }
    @PreAuthorize("hasAuthority('manager:warehouse:list')")
@@ -183,7 +182,7 @@
        } else {
            list = warehouseService.list();
        }
        ExcelUtil.build(ExcelUtil.create(list, Warehouse.class), response);
        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(list), Warehouse.class), response);
    }
    @ApiOperation("获取仓库树状图")