#站点初始化

zjj

6 天以前 2fa75417c23efbdfe0c5c08f72613beaa15c31c8

#站点初始化

 rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx

@@ -136,8 +136,7 @@
                actions={(
                    <TopToolbar>
                        <FilterButton />
                        <InitButton />
                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
                        <InitButton />                        
                        <SelectColumnsButton preferenceKey='deviceSite' />
                        <MyExportButton />
                    </TopToolbar>

 rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx

@@ -128,22 +128,29 @@
                                />
                            </Grid>
                            <Grid item xs={4}>
                                <TextInput
                                    label={translate("table.field.deviceSite.deviceSite")}
                                    name="deviceSites"
                                    placeholder={translate('common.action.inputPlaceholder')}
                                    size="small"
                                // type="number"
                            <ReferenceInput
                                source="deviceSites"
                                reference="basStation"                               
                            >
                                <SelectInput
                                    label="table.field.deviceSite.deviceSite"
                                    optionText="stationName"
                                    optionValue="stationName"                                   
                                />
                            </ReferenceInput>                                
                            </Grid>
                            <Grid item xs={4}>
                                <TextInput
                                    label={translate("table.field.deviceSite.site")}
                                    name="site"
                                    placeholder={translate('common.action.inputPlaceholder')}
                                    size="small"
                                // type="number"
                            <ReferenceInput
                                source="site"
                                reference="basStation"                                
                            >
                                <SelectInput
                                    label="table.field.deviceSite.site"
                                    optionText="stationName"
                                    optionValue="stationName"                                    
                                />
                            </ReferenceInput> 
                                
                            </Grid>
                            <Grid item xs={4}>
                                <TextInput

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

@@ -4,11 +4,15 @@
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.BasDevice;
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 +22,10 @@

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

    @Autowired
    private BasStationService basStationService;


    /**
     * 初始化站点
@@ -51,7 +59,15 @@
        List<String> targets = Arrays.asList(StringUtils.split(param.getTarget(), ","));
        List<DeviceSite> deviceSites =  new ArrayList<>();
        for (String site : sites) {
            BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, site));
            if (null == basStation) {
                throw new CoolException("初始化失败： 站点未找到！！");
            }
            for (String deviceSite : dvSites) {
                BasStation basStation2 = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, deviceSite));
                if (null == basStation2) {
                    throw new CoolException("初始化失败： 作业站点未找到！！");
                }
                for (Long id : param.getTypeIds()) {
                    for (String target : targets) {
                        DeviceSite site1 = new DeviceSite();