Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-05 cd24a045bd9ee29505ddc9760d25f5d4037f4f0c

 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java

@@ -13,8 +13,11 @@
import com.ycl.platform.domain.form.BatchEditPointForm;
import com.ycl.platform.domain.form.YwPointForm;
import com.ycl.platform.domain.query.YwPointQuery;
import com.ycl.platform.domain.result.BaseResult;
import com.ycl.platform.domain.vo.CheckTagVO;
import com.ycl.platform.domain.vo.ReportAuditingRecordVO;
import com.ycl.platform.domain.vo.YwPointVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.service.YwPointService;
@@ -32,6 +35,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
@@ -51,8 +55,7 @@
public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {

    private final SysDeptMapper sysDeptMapper;
    private final YwUnitService unitService;
    private final YwPeopleMapper ywPeopleMapper;
    private final TMonitorMapper monitorMapper;

    private static final ExecutorService executorService = new ThreadPoolExecutor(8,
            24,
@@ -310,4 +313,29 @@
        log.error("总共耗时：" + (endTime.getTime() - startTime.getTime()));
    }

    @Override
    public <T extends BaseResult> void setDeviceTagByGB(List<T> dataList) {
        List<String> gbList = dataList.stream().map(BaseResult::getNo).collect(Collectors.toList());
        List<CheckTagVO> pointList = baseMapper.getTagsByGB(gbList);
        Map<String, CheckTagVO> pointMap = pointList.stream().collect(Collectors.toMap(CheckTagVO::getNo, item -> item));
        for (BaseResult data : dataList) {
            CheckTagVO tag = pointMap.get(data.getNo());
            if (Objects.nonNull(tag)) {
                BeanUtils.copyProperties(tag, data);
            }
        }
    }

    @Override
    public <T extends BaseResult> void setNew(List<T> dataList) {
        List<String> gbList = dataList.stream().map(BaseResult::getNo).collect(Collectors.toList());
        Map<String, BaseResult> pointMap = dataList.stream().collect(Collectors.toMap(BaseResult::getNo, item -> item));
        List<String> dbGBList = monitorMapper.getGBbyGB(gbList);
        for (String gb : dbGBList) {
            BaseResult data = pointMap.get(gb);
            if (Objects.nonNull(data)) {
                data.setNewDevice(Boolean.TRUE);
            }
        }
    }
}