Merge remote-tracking branch 'origin/master'

Administrator

2023-08-22 e8a4f9014fbea4159ea15642226c6793d57d13ee

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

@@ -1,6 +1,7 @@
package com.ruoyi.alarmpoints.tube.service.impl;

import java.util.List;

import com.ruoyi.alarmpoints.tube.domain.ArdTubes;
import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesDetailsMapper;
@@ -9,7 +10,9 @@
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
@@ -24,6 +27,7 @@
    private ArdTubesMapper ardTubesMapper;
    @Resource
    private ArdTubesDetailsMapper ardTubesDetailsMapper;

    /**
     * 查询管线管理
     *
@@ -44,13 +48,16 @@
    @Override
    @DataScope(deptAlias = "d", userAlias = "u")
    public List<ArdTubes> selectArdTubesList(ArdTubes ardTubes) {
        ArdTubesDetails tubesDetails=new ArdTubesDetails();
        tubesDetails.setTubeId(ardTubes.getId());
        List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
        ArdTubes arttube=new ArdTubes();
        arttube.setChildCount(ardTubesDetails.size());
        ardTubesMapper.updateArdTubes(arttube);
        return ardTubesMapper.selectArdTubesList(ardTubes);

        List<ArdTubes> tubes = ardTubesMapper.selectArdTubesList(ardTubes);
        for (ArdTubes tube : tubes) {
            ArdTubesDetails tubesDetails = new ArdTubesDetails();
            tubesDetails.setTubeId(tube.getId());
            List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
            tube.setChildCount(ardTubesDetails.size());
            ardTubesMapper.updateArdTubes(tube);
        }
        return tubes;
    }

    /**
@@ -61,6 +68,7 @@
     */
    @Override
    public int insertArdTubes(ArdTubes ardTubes) {
        ardTubes.setId(IdUtils.simpleUUID());
        ardTubes.setChildCount(0);
        ardTubes.setUserId(SecurityUtils.getUserId());
        ardTubes.setCreateBy(SecurityUtils.getUsername());
@@ -90,11 +98,11 @@
     */
    @Override
    public int deleteArdTubesByIds(String[] ids) {
        for (String id: ids ) {
            ArdTubesDetails tubesDetails=new ArdTubesDetails();
        for (String id : ids) {
            ArdTubesDetails tubesDetails = new ArdTubesDetails();
            tubesDetails.setTubeId(id);
            List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
            if(ardTubesDetails.size()>0) {
            if (ardTubesDetails.size() > 0) {
                for (ArdTubesDetails tubesDetail : ardTubesDetails) {
                    int i = ardTubesDetailsMapper.deleteArdTubesDetailsById(tubesDetail.getId());
                }
@@ -111,10 +119,10 @@
     */
    @Override
    public int deleteArdTubesById(String id) {
        ArdTubesDetails tubesDetails=new ArdTubesDetails();
        ArdTubesDetails tubesDetails = new ArdTubesDetails();
        tubesDetails.setTubeId(id);
        List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(tubesDetails);
        if(ardTubesDetails.size()>0) {
        if (ardTubesDetails.size() > 0) {
            for (ArdTubesDetails tubesDetail : ardTubesDetails) {
                int i = ardTubesDetailsMapper.deleteArdTubesDetailsById(tubesDetail.getId());
            }