From b20fdb26e9d1d091fd7864de1edcc639e9da01b8 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 16 十月 2024 15:04:14 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java index 7512db7..aebae1e 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java @@ -58,6 +58,8 @@ private MapMapper mapMapper; @Autowired private SnowflakeIdWorker snowflakeIdWorker; + @Autowired + private LocService locService; @PreAuthorize("hasAuthority('manager:loc:list')") @PostMapping("/data/fetch") @@ -69,6 +71,7 @@ MapItem mapItem = new MapItem(); mapItem.setType(MapItemType.POINT.toString()); mapItem.setNo(code.getData()); + mapItem.setUuid(code.getUuid()); mapItem.setPositionX(code.getX()); mapItem.setPositionY(code.getY()); mapCodeItems.add(mapItem); @@ -112,6 +115,16 @@ return R.ok("Save Success"); } + @PostMapping("/shelf/group") + public R shelfGroup(@RequestParam(required = false) Integer row, @RequestParam(required = false) Integer bay) { + if (null == row || null == bay) { + return R.error(); + } + List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getRow, row).eq(Loc::getBay, bay).orderByAsc(Loc::getLev)); + return R.ok().add(locList); + } + + -- Gitblit v1.9.1