From dca1ee5b00f00dcf8c43776eb60bdd23e5cca056 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 三月 2024 15:23:29 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
index 5bad0af..8f6e0de 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
@@ -2,6 +2,7 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.core.map.controller.param.MapDataParam;
+import com.zy.asrs.wcs.core.map.controller.param.MapQueryParam;
import com.zy.asrs.wcs.core.map.service.MapService;
import com.zy.asrs.wcs.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,10 +23,16 @@
private MapService mapService;
// @PreAuthorize("hasAuthority('core:map:list')")
+ @PostMapping("/floor/list")
+ public R floorList() {
+ return R.ok().add(mapService.getMapFloorList(getLoginUserId()));
+ }
+
+
+ // @PreAuthorize("hasAuthority('core:map:list')")
@PostMapping("/list")
- @Transactional
- public R mapList() {
- return R.ok().add(mapService.getMapData(getLoginUserId()));
+ public R mapList(@RequestBody MapQueryParam param) {
+ return R.ok().add(mapService.getMapData(param, getLoginUserId()));
}
// @PreAuthorize("hasAuthority('core:map:save')")
--
Gitblit v1.9.1