bug修复

Lius

2025-05-15 5d5675fd6b6521c3d3e5887017a090c60897f6cd

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

@@ -22,12 +22,14 @@
import org.jeecg.modules.mdcJc.service.IMdcJcRcJobreportService;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.joda.time.LocalDateTime;
import org.springframework.stereotype.Service;

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

@@ -68,6 +70,9 @@

    @Resource
    private MdcBoardMapper mdcBoardMapper;

    @Resource
    private IMdcDeviceCalendarService mdcDeviceCalendarService;

    /**
     * 设备状态
@@ -172,7 +177,7 @@
                        mdcBoardRateVo.setOpenRate(equipmentStatisticalInfo.getOpenLong().divide(new BigDecimal("864"), 2, RoundingMode.HALF_UP));
                    }
                    if (equipmentStatisticalInfo.getOpenLong().compareTo(BigDecimal.ZERO) > 0) {
                        mdcBoardRateVo.setStartRate(equipmentStatisticalInfo.getProcessLong().multiply(new BigDecimal("100").divide(equipmentStatisticalInfo.getOpenLong(), 2, RoundingMode.HALF_UP)));
                        mdcBoardRateVo.setStartRate(equipmentStatisticalInfo.getProcessLong().multiply(new BigDecimal("100")).divide(equipmentStatisticalInfo.getOpenLong(), 2, RoundingMode.HALF_UP));
                    }
                    statisticsMap.put(date, mdcBoardRateVo);
                }
@@ -311,8 +316,8 @@
        String realName = commonAPI.translateDictFromTable("sys_user", "realname", "username", mdcBoardEquRealTImeVo.getEquipmentManager());
        mdcBoardEquRealTImeVo.setEquipmentManager(realName);
        mdcBoardEquRealTImeVo.setAlarm("无");
        if (mdcBoardEquRealTImeVo.getOporation() != null) {
            switch (mdcBoardEquRealTImeVo.getOporation()) {
        if (mdcBoardEquRealTImeVo.getOperation() != null) {
            switch (mdcBoardEquRealTImeVo.getOperation()) {
                case 1:
                case 2:
                    mdcBoardEquRealTImeVo.setOporationDict("待机");
@@ -334,7 +339,7 @@
            }
        } else {
            mdcBoardEquRealTImeVo.setOporationDict("关机");
            mdcBoardEquRealTImeVo.setOporation(0);
            mdcBoardEquRealTImeVo.setOperation(0);
        }
        //设备运行数据
        Map<String, Object> mapData = equipmentWorkLineService.getDataList(mdcBoardEquRealTImeVo.getSaveTableName());
@@ -383,7 +388,12 @@
        } else {
            mdcBoardEquRealTImeVo.setReportRepairStatus("无");
        }
        // 下次点检下次保养
        // 班次
        String shift = mdcDeviceCalendarService.findShiftByEquId(equipmentId);
        if (StringUtils.isNotBlank(shift)) {
            mdcBoardEquRealTImeVo.setShift(shift);
        }
        // 点检  保养
        Date nextInspection = mdcBoardMapper.findInsOrMain(equipmentId, MaintenanceCategoryEnum.POINT_INSPECTION.name());
        if (nextInspection != null) {
            mdcBoardEquRealTImeVo.setNextInspection(nextInspection);