自动化产线集成写库取消

Lius

4 天以前 e8f24fe86ec48d7e4cd0179fa8cdaa464526d562

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.jeecg.modules.mdc.dto.MdcEquipmentStatisticalDto;
import org.jeecg.modules.mdc.entity.Equipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentRepair;
import org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection;
@@ -93,9 +94,21 @@
        }
    }

    @Override
    public MdcEquipmentStatisticalDto findByEquipmentAndMonth(String equipmentId, String date) {
        return this.baseMapper.findByEquipmentAndMonth(equipmentId, date);
    }

    @Override
    public List<MdcEquipmentStatisticalDto> findShiftByEquipmentAndMonth(String equipmentId, String date) {
        return this.baseMapper.findShiftByEquipmentAndMonth(equipmentId, date);
    }

    @Transactional(readOnly = true)
    List<MdcEquipmentStatisticalShiftInfo> equipmentShiftStatisticalProcess(Equipment equipment, String dateTime) {
    public List<MdcEquipmentStatisticalShiftInfo> equipmentShiftStatisticalProcess(Equipment equipment, String dateTime) {
        Date initDate = null;
        List<String> stringDates = new ArrayList<>();
        Date endDate = DateUtils.plusTime(DateUtils.getNow(), 0);
        //取最后的统计数据
        if (StringUtils.isBlank(dateTime)) {
            MdcEquipmentStatisticalShiftInfo nearestDate = this.baseMapper.getMaxStaticsData(equipment.getEquipmentid());
@@ -109,6 +122,17 @@
                    initDate = equipmentRunningSection.getStartTime();
                }
            }
            if (initDate == null) {
                return null;
            }
            if (!DateUtils.less(initDate, endDate)) {
                return Collections.emptyList();
            }
            //获取两个时间段的差
            stringDates = DateUtils.getDatesStringList2(initDate, DateUtils.plusTime(endDate, -1));
            if (stringDates.isEmpty()) {
                return Collections.emptyList();
            }
        } else {
            try {
                initDate = DateUtils.toDate(dateTime, "yyyyMMdd");
@@ -117,18 +141,13 @@
                log.error("参数格式不对", null);
                return null;
            }
        }
        if (initDate == null) {
            return null;
        }
        Date endDate = DateUtils.plusTime(DateUtils.getNow(), 0);
        if (!DateUtils.less(initDate, endDate)) {
            return Collections.emptyList();
        }
        //获取两个时间段的差
        List<String> stringDates = DateUtils.getDatesStringList2(initDate, DateUtils.plusTime(endDate, -1));
        if (stringDates.isEmpty()) {
            return Collections.emptyList();
            if (initDate == null) {
                return null;
            }
            if (!DateUtils.less(initDate, endDate)) {
                return Collections.emptyList();
            }
            stringDates.add(DateUtils.format(initDate, DateUtils.STRDATE));
        }
        //查询班制班次信息
        Map<String, List<MdcDeviceCalendarVo>> listMap = this.mdcDeviceCalendarMap(equipment.getEquipmentid(), stringDates);