看板周利用率，日利用率

Lius

2025-03-04 61bd1f27cb0f83890bfcd9aec6257eda13c0fc4d

 lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java

@@ -8,8 +8,9 @@
import org.jeecg.modules.mdc.service.IMdcEquipmentStatisticalInfoService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.screen.dto.EquipmentStatusOverview;
import org.jeecg.modules.screen.dto.UtilizationMonth;
import org.jeecg.modules.screen.dto.UtilizationMonthDto;
import org.jeecg.modules.screen.dto.UtilizationDayDto;
import org.jeecg.modules.screen.dto.UtilizationRate;
import org.jeecg.modules.screen.dto.UtilizationRateDto;
import org.jeecg.modules.screen.service.MdcLargeScreenService;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
@@ -18,6 +19,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;

@@ -115,12 +117,12 @@
        result.put("dateList", dateList);

        // 计算每个子生产的月度利用率
        List<UtilizationMonthDto> utilizationMonthDtoList = mdcProductionList.stream()
        List<UtilizationRateDto> utilizationMonthDtoList = mdcProductionList.stream()
                .map(mdcProduction -> createUtilizationMonthDto(mdcProduction, dateLists))
                .collect(Collectors.toList());

        // 计算总厂的月度利用率
        UtilizationMonthDto totalUtilizationMonthDto = createTotalUtilizationMonthDto(productionId, dateLists);
        UtilizationRateDto totalUtilizationMonthDto = createTotalUtilizationMonthDto(productionId, dateLists);
        utilizationMonthDtoList.add(totalUtilizationMonthDto);

        result.put("dataList", utilizationMonthDtoList);
@@ -128,14 +130,104 @@
    }

    /**
     * 设备周利用率趋势
     *
     * @param productionId
     * @return
     */
    @Override
    public Map<String, Object> weekUtilizationTendency(String productionId) {
        Map<String, Object> result = new HashMap<>();

        // 获取子生产列表
        List<MdcProduction> mdcProductionList = mdcProductionService.list(
                new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getParentId, productionId)
        );

        if (mdcProductionList == null || mdcProductionList.isEmpty()) {
            return result;
        }
        // 生成周范围
        List<String> dateList = DateUtils.getNearWeek();
        result.put("dateList", dateList);
        // 计算每个工段的利用率
        List<UtilizationRateDto> utilizationMonthDtoList = new ArrayList<>();
        for (MdcProduction mdcProduction : mdcProductionList) {
            UtilizationRateDto utilizationRateDto = new UtilizationRateDto();
            utilizationRateDto.setProductionId(mdcProduction.getId());
            utilizationRateDto.setProductionName(mdcProduction.getProductionName());
            List<UtilizationRate> utilizationRates = dateList.stream()
                    .map(date -> {
                        UtilizationRate utilizationMonth = new UtilizationRate();
                        utilizationMonth.setDate(date);
                        BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationWeek(productionId, date.replaceAll("-", ""));
                        utilizationMonth.setUtilizationRate(utilizationRate);
                        return utilizationMonth;
                    })
                    .collect(Collectors.toList());
            utilizationRateDto.setUtilizationMonthList(utilizationRates);
            utilizationMonthDtoList.add(utilizationRateDto);
        }
        //计算总厂的利用率
        UtilizationRateDto utilizationRateDto = new UtilizationRateDto();
        utilizationRateDto.setProductionName("总厂");
        List<UtilizationRate> utilizationRates = dateList.stream()
                .map(date -> {
                    UtilizationRate utilizationMonth = new UtilizationRate();
                    utilizationMonth.setDate(date);
                    BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationWeekTotal(productionId, date.replaceAll("-", ""));
                    utilizationMonth.setUtilizationRate(utilizationRate);
                    return utilizationMonth;
                })
                .collect(Collectors.toList());
        utilizationRateDto.setUtilizationMonthList(utilizationRates);
        utilizationMonthDtoList.add(utilizationRateDto);
        result.put("dataList", utilizationMonthDtoList);
        return result;
    }

    /**
     * 设备日利用率
     *
     * @param productionId
     * @return
     */
    @Override
    public Map<String, Object> dayUtilizationTendency(String productionId) {
        Map<String, Object> result = new HashMap<>();
        // 获取子生产列表
        List<MdcProduction> mdcProductionList = mdcProductionService.list(
                new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getParentId, productionId)
        );

        if (mdcProductionList == null || mdcProductionList.isEmpty()) {
            return result;
        }
        List<String> productionList = mdcProductionList.stream().map(MdcProduction::getProductionName).collect(Collectors.toList());
        result.put("productionList", productionList);

        String date = LocalDate.now().minusDays(1).toString().replaceAll("-", "");
        List<UtilizationDayDto> utilizationDayDtos = new ArrayList<>();
        for (MdcProduction mdcProduction : mdcProductionList) {
            UtilizationDayDto utilizationDayDto = new UtilizationDayDto();
            utilizationDayDto.setProductionName(mdcProduction.getProductionName());
            BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationWeekTotal(mdcProduction.getId(), date);
            utilizationDayDto.setUtilizationRate(utilizationRate);
            utilizationDayDtos.add(utilizationDayDto);
        }
        result.put("dataList", utilizationDayDtos);
        return result;
    }

    /**
     * 创建子生产的月度利用率 DTO
     */
    private UtilizationMonthDto createUtilizationMonthDto(MdcProduction mdcProduction, List<String[]> dateLists) {
        UtilizationMonthDto utilizationMonthDto = new UtilizationMonthDto();
    private UtilizationRateDto createUtilizationMonthDto(MdcProduction mdcProduction, List<String[]> dateLists) {
        UtilizationRateDto utilizationMonthDto = new UtilizationRateDto();
        utilizationMonthDto.setProductionId(mdcProduction.getId());
        utilizationMonthDto.setProductionName(mdcProduction.getProductionName());

        List<UtilizationMonth> utilizationMonthList = calculateUtilizationRates(mdcProduction.getId(), dateLists);
        List<UtilizationRate> utilizationMonthList = calculateUtilizationRates(mdcProduction.getId(), dateLists);
        utilizationMonthDto.setUtilizationMonthList(utilizationMonthList);

        return utilizationMonthDto;
@@ -144,11 +236,11 @@
    /**
     * 创建总厂的月度利用率 DTO
     */
    private UtilizationMonthDto createTotalUtilizationMonthDto(String productionId, List<String[]> dateLists) {
        UtilizationMonthDto utilizationMonthDto = new UtilizationMonthDto();
    private UtilizationRateDto createTotalUtilizationMonthDto(String productionId, List<String[]> dateLists) {
        UtilizationRateDto utilizationMonthDto = new UtilizationRateDto();
        utilizationMonthDto.setProductionName("总厂");

        List<UtilizationMonth> utilizationMonthList = calculateUtilizationRatesTotal(productionId, dateLists);
        List<UtilizationRate> utilizationMonthList = calculateUtilizationRatesTotal(productionId, dateLists);
        utilizationMonthDto.setUtilizationMonthList(utilizationMonthList);

        return utilizationMonthDto;
@@ -157,11 +249,11 @@
    /**
     * 计算子生产的月度利用率
     */
    private List<UtilizationMonth> calculateUtilizationRates(String productionId, List<String[]> dateLists) {
    private List<UtilizationRate> calculateUtilizationRates(String productionId, List<String[]> dateLists) {
        return dateLists.stream()
                .map(dates -> {
                    UtilizationMonth utilizationMonth = new UtilizationMonth();
                    utilizationMonth.setMonth(dates[2]);
                    UtilizationRate utilizationMonth = new UtilizationRate();
                    utilizationMonth.setDate(dates[2]);
                    BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationMonth(productionId, dates[0], dates[1]);
                    utilizationMonth.setUtilizationRate(utilizationRate);
                    return utilizationMonth;
@@ -172,11 +264,11 @@
    /**
     * 计算总厂的月度利用率
     */
    private List<UtilizationMonth> calculateUtilizationRatesTotal(String productionId, List<String[]> dateLists) {
    private List<UtilizationRate> calculateUtilizationRatesTotal(String productionId, List<String[]> dateLists) {
        return dateLists.stream()
                .map(dates -> {
                    UtilizationMonth utilizationMonth = new UtilizationMonth();
                    utilizationMonth.setMonth(dates[2]);
                    UtilizationRate utilizationMonth = new UtilizationRate();
                    utilizationMonth.setDate(dates[2]);
                    BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationMonthTotal(productionId, dates[0], dates[1]);
                    utilizationMonth.setUtilizationRate(utilizationRate);
                    return utilizationMonth;