部分设备日志无法显示修改

hyingbo

3 天以前 7e0152c5c1d1c0cd38b59ffaea3222dcde13012e

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

@@ -1,6 +1,7 @@
package org.jeecg.modules.mdc.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.system.vo.DictModel;
@@ -79,9 +80,18 @@
                dto = new MdcEquipmentRunningSectionDto();
                BeanUtils.copyProperties(entity, dto);
                if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && isTableExist && !"ZUOLAN".equals(equip.getDrivetype())) {
                    List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(tableName, entity.getStartTime(), entity.getEndTime());
                    if (esList != null && esList.size() > 1) {
                        dto.setSequenceNumber(esList.get(0).getSequencenumber());
                    //FANUC获取程序名特殊处理
                    if (equip.getDrivetype().startsWith("FANUC")) {
                        List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipProgramNum(equip.getDrivetype(), equip.getEquipmentid(),
                                entity.getStartTime(), entity.getEndTime());
                        if (esList != null && esList.size() > 1) {
                            dto.setSequenceNumber(esList.get(0).getProductName());
                        }
                    }else {
                        List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(tableName, entity.getStartTime(), entity.getEndTime());
                        if (esList != null && esList.size() > 1) {
                            dto.setSequenceNumber(esList.get(0).getSequencenumber());
                        }
                    }
                }
                dtos.add(dto);
@@ -94,9 +104,14 @@
                BeanUtils.copyProperties(entity, dto);
                if (entity.getStatus() == 22) {
                    if (equip != null) {
                        List<MdcAlarmInfo> mdcAlarmInfo = mdcAlarmInfoService.list(new LambdaQueryWrapper<MdcAlarmInfo>().eq(MdcAlarmInfo::getDriveType, equip.getDrivetype()).eq(MdcAlarmInfo::getAlarmCode, entity.getAlarm()).eq(MdcAlarmInfo::getIsUse, 0));
                        if (mdcAlarmInfo != null && !mdcAlarmInfo.isEmpty()) {
                            dto.setAlarmContent(mdcAlarmInfo.get(0).getAlarmContent());
                        Set<TmpEquipmentAlarm> tmpEquipmentAlarmSet = entity.getTmpEquipmentAlarmSet();
                        if (CollectionUtils.isNotEmpty(tmpEquipmentAlarmSet)) {
                            dto.setAlarmContent(tmpEquipmentAlarmSet.stream().findFirst().get().getAlarmContent());
                        }else {
                            List<MdcAlarmInfo> mdcAlarmInfo = mdcAlarmInfoService.list(new LambdaQueryWrapper<MdcAlarmInfo>().eq(MdcAlarmInfo::getDriveType, equip.getDrivetype()).eq(MdcAlarmInfo::getAlarmCode, entity.getAlarm()).eq(MdcAlarmInfo::getIsUse, 0));
                            if (mdcAlarmInfo != null && !mdcAlarmInfo.isEmpty()) {
                                dto.setAlarmContent(mdcAlarmInfo.get(0).getAlarmContent());
                            }
                        }
                    }
                }
@@ -215,6 +230,9 @@
            queryWrapper.le(MdcEquipmentRunningSection::getStartTime, endTime);
            queryWrapper.orderByAsc(MdcEquipmentRunningSection::getStartTime);
            list = this.baseMapper.selectList(queryWrapper);

            list = mergeErrorRunningTrace(list);

        }
        if (list == null || list.isEmpty()) {
            return Collections.emptyList();
@@ -556,7 +574,7 @@
                    List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipProgramNum(equip.getDrivetype(), equip.getEquipmentid(),
                            e.getStartTime(), e.getEndTime());
                    if (esList != null && esList.size() > 1) {
                        e.setSequenceNumber(esList.get(0).getProgramnumber());
                        e.setSequenceNumber(esList.get(0).getProductName());
                    }
                } else if (StringUtils.isNotBlank(equip.getDrivetype()) && equip.getDrivetype().startsWith("SIEMENS")) {
                    List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getDrivetype() + "_" + equip.getEquipmentid(), e.getStartTime(), e.getEndTime());