Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

Junjie

2024-03-26 2e95a2b66132930106816be0217169680fd55282

Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java

@@ -23,6 +23,13 @@
    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")
    public R mapList(@RequestBody MapQueryParam param) {
        return R.ok().add(mapService.getMapData(param, getLoginUserId()));

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java

@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.Optional;

/**
 * Created by vincent on 3/15/2024
@@ -26,14 +27,16 @@
    @Autowired
    private DictService dictService;

    public String getMapFloorList(Long userId) {
        String floorKey = "map-floor-list";
        Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, floorKey));
        return Optional.ofNullable(dict).map(Dict::getValue).orElse(null);
    }

    public String getMapData(MapQueryParam param, Long userId) {
        String mapKey = getMapKey(param.getFloor());
        Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, mapKey));
        if (Cools.isEmpty(dict)) {
            return null;
        } else {
            return dict.getValue();
        }
        return Optional.ofNullable(dict).map(Dict::getValue).orElse(null);
    }

    public void saveMapData(MapDataParam param, Long userId) {