From 43ce7b36bbc9634d3ca4791cac2b64676d421635 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 三月 2024 13:05:10 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 3 ++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/param/MapQueryParam.java | 13 +++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java | 5 +++--
3 files changed, 18 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 38a6053..b0c320d 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;
@@ -23,8 +24,8 @@
// @PreAuthorize("hasAuthority('core:map:list')")
@PostMapping("/list")
- 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')")
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/param/MapQueryParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/param/MapQueryParam.java
new file mode 100644
index 0000000..8fd9606
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/param/MapQueryParam.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.wcs.core.map.controller.param;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 3/21/2024
+ */
+@Data
+public class MapQueryParam {
+
+ private Integer floor;
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
index 4ec28c1..8a4dd70 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
@@ -4,6 +4,7 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
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.system.entity.User;
import com.zy.asrs.wcs.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +19,7 @@
@Autowired
private UserService userService;
- public MapDataParam getMapData(Long userId) {
+ public MapDataParam getMapData(MapQueryParam param, Long userId) {
User user = userService.getById(userId);
if (Cools.isEmpty(user.getMemo())) {
return new MapDataParam();
--
Gitblit v1.9.1