Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-15 2dc82639ec241aa69f75f7fa6dce5df4942a5665

 ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java

@@ -2,14 +2,19 @@

import java.util.List;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.alarmpoints.tube.domain.ArdTubes;
import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails;
import com.ruoyi.alarmpoints.tube.domain.ArdTubesParam;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesDetailsMapper;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesMapper;
import com.ruoyi.alarmpoints.tube.service.IArdTubesService;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.utils.result.Results;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -67,6 +72,7 @@
     */
    @Override
    public int insertArdTubes(ArdTubes ardTubes) {
        ardTubes.setId(IdUtils.simpleUUID());
        ardTubes.setChildCount(0);
        ardTubes.setUserId(SecurityUtils.getUserId());
        ardTubes.setCreateBy(SecurityUtils.getUsername());
@@ -127,4 +133,56 @@
        }
        return ardTubesMapper.deleteArdTubesById(id);
    }

    @Override
    public Results tubeById(String id) {
        ArdTubes ardTubes = ardTubesMapper.selectById(id);
        if(ardTubes!=null){
            QueryWrapper<ArdTubesDetails> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("tube_id",id);
            List<ArdTubesDetails> list = ardTubesDetailsMapper.selectList(queryWrapper);
            ardTubes.setArdTubesDetails(list);
        }
        return Results.succeed(ardTubes);
    }

    @Override
    public Results tobeList(List<Long> deptList) {
        QueryWrapper<ArdTubes> queryWrapper = new QueryWrapper<>();
        queryWrapper.in("dept_id",deptList);
        List<ArdTubes> list = ardTubesMapper.selectList(queryWrapper);
        if(list.size()>0){
            for (int i = 0; i < list.size(); i++) {
                ArdTubes ardTubes = list.get(i);
                QueryWrapper<ArdTubesDetails> detailsQueryWrapper = new QueryWrapper<>();
                queryWrapper.eq("tube_id",ardTubes.getId());
                List<ArdTubesDetails> details = ardTubesDetailsMapper.selectList(detailsQueryWrapper);
                ardTubes.setArdTubesDetails(details);
            }
        }
        return Results.succeed(list);
    }

    @Override
    public Results conditionList(ArdTubesParam ardTubesParam) {
        QueryWrapper<ArdTubes> queryWrapper = new QueryWrapper<>();
        queryWrapper.in("dept_id",ardTubesParam.getDeptList())
                .eq(!StringUtils.isBlank(ardTubesParam.getName()),"name",ardTubesParam.getName())
                .eq(!StringUtils.isBlank(ardTubesParam.getType()),"type",ardTubesParam.getType())
                .eq(!StringUtils.isBlank(ardTubesParam.getPipeDiameter()),"pipe_diameter",ardTubesParam.getPipeDiameter())
                .eq(!StringUtils.isBlank(ardTubesParam.getColor()),"color",ardTubesParam.getColor());
        List<ArdTubes> list = ardTubesMapper.selectList(queryWrapper);
        if(list.size()>0){
            for (int i = 0; i < list.size(); i++) {
                ArdTubes ardTubes = list.get(i);
                QueryWrapper<ArdTubesDetails> detailsQueryWrapper = new QueryWrapper<>();
                queryWrapper.eq("tube_id",ardTubes.getId());
                List<ArdTubesDetails> details = ardTubesDetailsMapper.selectList(detailsQueryWrapper);
                ardTubes.setArdTubesDetails(details);
            }
        }
        return Results.succeed(list);
    }


}