第二次筛选物料列表为空问题修复

skyouc

7 天以前 51ea5c4baf680676ee6c00dbcbbee81b3ad32059

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java

@@ -1,14 +1,16 @@
package com.vincent.rsf.server.manager.service.impl;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.DeviceSiteParame;
import com.vincent.rsf.server.manager.entity.BasStation;
import com.vincent.rsf.server.manager.mapper.DeviceSiteMapper;
import com.vincent.rsf.server.manager.entity.DeviceSite;
import com.vincent.rsf.server.manager.service.BasStationService;
import com.vincent.rsf.server.manager.service.DeviceSiteService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
@@ -18,6 +20,10 @@

@Service("deviceSiteService")
public class DeviceSiteServiceImpl extends ServiceImpl<DeviceSiteMapper, DeviceSite> implements DeviceSiteService {

    @Autowired
    private BasStationService basStationService;


    /**
     * 初始化站点
@@ -51,14 +57,22 @@
        List<String> targets = Arrays.asList(StringUtils.split(param.getTarget(), ","));
        List<DeviceSite> deviceSites =  new ArrayList<>();
        for (String site : sites) {
            BasStation basStation = basStationService.getById(site);
            if (null == basStation) {
                throw new CoolException("初始化失败： 站点未找到！！");
            }
            for (String deviceSite : dvSites) {
                BasStation basStation2 = basStationService.getById(deviceSite);
                if (null == basStation2) {
                    throw new CoolException("初始化失败： 作业站点未找到！！");
                }
                for (Long id : param.getTypeIds()) {
                    for (String target : targets) {
                        DeviceSite site1 = new DeviceSite();
                        site1.setType(id + "")
                                .setSite(site)
                                .setSite(basStation.getStationName())
                                .setDevice(param.getDeviceType())
                                .setDeviceSite(deviceSite)
                                .setDeviceSite(basStation2.getStationName())
                                .setTarget(target)
                                .setDeviceCode(param.getDeviceCode())
                                .setChannel(param.getChannel())