From 72702f24f145781f5423edb6e52b34d72778eb0e Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 23 三月 2026 13:26:00 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 babdeee..337af90 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
@@ -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
@@ -142,11 +153,15 @@
}
@PostMapping("/shelf/group")
- public R shelfGroup(@RequestParam(required = false) Integer row, @RequestParam(required = false) Integer bay) {
- if (null == row || null == bay) {
+ public R shelfGroup(@RequestParam(required = false) Integer rowNo,
+ @RequestParam(required = false) Integer bayNo) {
+ if (null == rowNo || null == bayNo) {
return R.error();
}
- List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getRow, row).eq(Loc::getBay, bay).orderByAsc(Loc::getLev));
+ List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getRowNo, rowNo)
+ .eq(Loc::getBayNo, bayNo)
+ .orderByAsc(Loc::getLevNo));
return R.ok().add(locList);
}
--
Gitblit v1.9.1