lsh#

1

12 小时以前 787bae747de46eb1b7c7d63031ddf109b92fa1bc

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java

@@ -35,16 +35,24 @@
        PageParam<BasStation, BaseParam> page = basStationService.page(pageParam, pageParam.buildWrapper(true));
        for (BasStation station : page.getRecords()) {
            if (!Cools.isEmpty(station.getCrossZoneArea())) {
                List<Long> longs1 = JSONObject.parseArray(station.getCrossZoneArea(), Long.class);
                List<Long> longs1 = station.getCrossZoneArea();
                station.setAreaIds(longs1);
            }
            if (!Cools.isEmpty(station.getContainerType())) {
                List<Long> longs1 = JSONObject.parseArray(station.getContainerType(), Long.class);
                List<Long> longs1 = station.getContainerType();
                station.setContainerTypes(longs1);
            }

        }
        return R.ok().add(page);
    }

    @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
    @PostMapping("/basStation/page/v1")
    public R pagev22(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<BasStation, BaseParam> pageParam = new PageParam<>(baseParam, BasStation.class);
        return R.ok().add(basStationService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('manager:basStation:list')")
@@ -64,15 +72,13 @@
    public R get(@PathVariable("id") Long id) {
        BasStation station = basStationService.getById(id);
        if (!Cools.isEmpty(station.getCrossZoneArea())) {
            List<Long> longs1 = JSONObject.parseArray(station.getCrossZoneArea(), Long.class);
            List<Long> longs1 = station.getCrossZoneArea();
            station.setAreaIds(longs1);
        }
        if (!Cools.isEmpty(station.getContainerType())) {
            List<Long> longs1 = JSONObject.parseArray(station.getContainerType(), Long.class);
            List<Long> longs1 = station.getContainerType();
            station.setContainerTypes(longs1);
        }



        return R.ok().add(station);
    }
@@ -90,10 +96,16 @@
            return R.error(basStation.getStationName()+"站已被初始化");
        }
        if (null !=basStation.getAreaIds()){
            basStation.setCrossZoneArea(basStation.getAreaIds().toString());
            basStation.setCrossZoneArea(basStation.getAreaIds());
        }
        if (null !=basStation.getContainerTypes()){
            basStation.setContainerType(basStation.getContainerTypes().toString());
            basStation.setContainerType(basStation.getContainerTypes());
        }
        if (Cools.isEmpty(basStation.getStationAlias())){
            basStation.setStationAlias(new ArrayList<>());
            basStation.getStationAlias().add(basStation.getStationName());
        } else if (!basStation.getStationAlias().contains(basStation.getStationName())){
            basStation.getStationAlias().add(basStation.getStationName());
        }
        if (!basStationService.save(basStation)) {
            return R.error("保存失败");
@@ -108,14 +120,20 @@
        basStation.setUpdateBy(getLoginUserId());
        basStation.setUpdateTime(new Date());
        if (null !=basStation.getAreaIds() && !basStation.getContainerTypes().isEmpty()){
            basStation.setCrossZoneArea(basStation.getAreaIds().toString());
            basStation.setCrossZoneArea(basStation.getAreaIds());
        }
        if (null != basStation.getContainerTypes() && !basStation.getContainerTypes().isEmpty()){
            basStation.setContainerType(basStation.getContainerTypes().toString());
            basStation.setContainerType(basStation.getContainerTypes());
        }
        if (null !=basStation.getUseStatus() && basStation.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)){
            basStation.setBarcode(null);
        }
        if (Cools.isEmpty(basStation.getStationAlias())){
            basStation.setStationAlias(new ArrayList<>());
            basStation.getStationAlias().add(basStation.getStationName());
        } else if (!basStation.getStationAlias().contains(basStation.getStationName())){
            basStation.getStationAlias().add(basStation.getStationName());
        }
        if (!basStationService.updateById(basStation)) {
            return R.error("更新失败");
        }