lsh#

1

11 小时以前 787bae747de46eb1b7c7d63031ddf109b92fa1bc

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

@@ -35,11 +35,11 @@
        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);
            }

@@ -72,11 +72,11 @@
    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);
        }

@@ -96,10 +96,10 @@
            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<>());
@@ -120,10 +120,10 @@
        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);