Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

1 天以前 a488088a18a9b8808bc57124681cee8c4ada7299

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

@@ -16,12 +16,15 @@
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;

@RestController
@Api(tags = "站点管理")
public class BasStationController extends BaseController {

    @Autowired
@@ -35,11 +38,15 @@
        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().stream()
                        .map(Integer::longValue)
                        .collect(Collectors.toList());
                station.setAreaIds(longs1);
            }
            if (!Cools.isEmpty(station.getContainerType())) {
                List<Long> longs1 = JSONObject.parseArray(station.getContainerType(), Long.class);
                List<Long> longs1 = station.getContainerType().stream()
                        .map(Integer::longValue)
                        .collect(Collectors.toList());
                station.setContainerTypes(longs1);
            }

@@ -72,11 +79,15 @@
    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().stream()
                    .map(Integer::longValue)
                    .collect(Collectors.toList());
            station.setAreaIds(longs1);
        }
        if (!Cools.isEmpty(station.getContainerType())) {
            List<Long> longs1 = JSONObject.parseArray(station.getContainerType(), Long.class);
            List<Long> longs1 = station.getContainerType().stream()
                    .map(Integer::longValue)
                    .collect(Collectors.toList());
            station.setContainerTypes(longs1);
        }

@@ -96,10 +107,14 @@
            return R.error(basStation.getStationName()+"站已被初始化");
        }
        if (null !=basStation.getAreaIds()){
            basStation.setCrossZoneArea(basStation.getAreaIds().toString());
            basStation.setCrossZoneArea(basStation.getAreaIds().stream()
                    .map(Long::intValue)
                    .collect(Collectors.toList()));
        }
        if (null !=basStation.getContainerTypes()){
            basStation.setContainerType(basStation.getContainerTypes().toString());
            basStation.setContainerType(basStation.getContainerTypes().stream()
                    .map(Long::intValue)
                    .collect(Collectors.toList()));
        }
        if (Cools.isEmpty(basStation.getStationAlias())){
            basStation.setStationAlias(new ArrayList<>());
@@ -120,10 +135,14 @@
        basStation.setUpdateBy(getLoginUserId());
        basStation.setUpdateTime(new Date());
        if (null !=basStation.getAreaIds() && !basStation.getContainerTypes().isEmpty()){
            basStation.setCrossZoneArea(basStation.getAreaIds().toString());
            basStation.setCrossZoneArea(basStation.getAreaIds().stream()
                    .map(Long::intValue)
                    .collect(Collectors.toList()));
        }
        if (null != basStation.getContainerTypes() && !basStation.getContainerTypes().isEmpty()){
            basStation.setContainerType(basStation.getContainerTypes().toString());
            basStation.setContainerType(basStation.getContainerTypes().stream()
                    .map(Long::intValue)
                    .collect(Collectors.toList()));
        }
        if (null !=basStation.getUseStatus() && basStation.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)){
            basStation.setBarcode(null);