#
luxiaotao1123
2024-03-21 43ce7b36bbc9634d3ca4791cac2b64676d421635
#
1个文件已添加
2个文件已修改
21 ■■■■ 已修改文件
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/param/MapQueryParam.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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')")
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/param/MapQueryParam.java
New file
@@ -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;
}
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();