blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
1
1 天以前 0f3ba9d165742d5653f7dc4797223cee7b5856f4 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java


@@ -1,10 +1,8 @@


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.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;


@@ -14,6 +12,7 @@


import org.apache.commons.lang3.StringUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import java.util.ArrayList;


import java.util.Arrays;


@@ -33,6 +32,7 @@


     * @return


     */


    @Override


    @Transactional(rollbackFor = Exception.class)


    public boolean initSites(DeviceSiteParame param) {


        if (param.getFlagInit() == 1) {


            List<DeviceSite> list = this.list(new LambdaQueryWrapper<DeviceSite>().select(DeviceSite::getId).last("limit 1"));


@@ -59,12 +59,12 @@


        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));


            BasStation basStation = basStationService.getById(site);


            if (null == basStation) {


                throw new CoolException("初始化失败： 站点未找到！！");


            }


            for (String deviceSite : dvSites) {


                BasStation basStation2 = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, deviceSite));


                BasStation basStation2 = basStationService.getById(deviceSite);


                if (null == basStation2) {


                    throw new CoolException("初始化失败： 作业站点未找到！！");


                }


@@ -72,11 +72,13 @@


                    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())


                                .setAreaIdStart(param.getAreaIdStart())


                                .setAreaIdEnd(param.getAreaIdEnd())


                                .setChannel(param.getChannel())


                                ;


                        deviceSites.add(site1);