update

Lius

2024-04-19 652d170d32afc15682bbdef4d630b057e67361c7

update

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

@@ -5,15 +5,9 @@
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.modules.mdc.constant.MdcConstant;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.Equipment;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo;
import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency;
import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcHomeMapper;
import org.jeecg.modules.mdc.service.IEquipmentService;
import org.jeecg.modules.mdc.service.IEquipmentWorkLineService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcHomeService;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.system.entity.MdcProduction;
@@ -51,6 +45,9 @@

    @Resource
    private IMdcProductionService mdcProductionService;

    @Resource
    private IEquipmentLogService equipmentLogService;

    /**
     * 设备运行状态统计
@@ -477,6 +474,9 @@
        }
        String saveTableName = mdcEquipment.getSaveTableName();
        MdcEquipmentDto dto = equipmentWorkLineService.getMacingDataList(saveTableName);
        // 查询设备状态
        EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId());
        Integer oporation = equipmentLog.getOporation();
        if ("LSV2".equals(mdcEquipment.getDriveType())) {
            dto.setSpindlebeilv(dto.getSFeed());
            dto.setFeedbeilv(dto.getFFeed());
@@ -486,6 +486,11 @@
            dto.setOPTVersion(dto.getOPTVersion());
            dto.setPLCVersion(dto.getPLCVersion());
        }
        if (oporation == 22) {
            dto.setALRMstate(equipmentLog.getAlarm());
        } else {
            dto.setALRMstate("无");
        }
        return dto;
    }
}