mdc模块更新

Lius

2025-08-25 2b9ff0c274a847af41b2f5a04de1b23ed6fbb9bb

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

@@ -9,7 +9,6 @@
import org.jeecg.modules.mdc.service.IMdcDriveTypeParamConfigService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcEquipmentWorkLineService;
import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcWorkChartVo;
import org.springframework.stereotype.Service;
@@ -36,9 +35,6 @@

    @Resource
    private EquipmentWorklineMapper equipmentWorklineMapper;

    @Resource
    private IMdcTorqueConfigService mdcTorqueConfigService;

    /**
     * 查找指定日期的数据
@@ -71,12 +67,6 @@
            return null;
        }
        List<EquipmentMachingDto> result = this.getWorkLineList(saveTableName, mdcDriveTypeParamConfigs, mdcWorkChartVo, startTime, endTime);
        // 查找扭矩和进给参数
        List<EquipmentMachingDto> torqueList = mdcTorqueConfigService.getWorkLineList(mdcWorkChartVo.getEquipmentId(), startTime, endTime);
        if (torqueList != null && !torqueList.isEmpty()) {
            result.addAll(torqueList);
            result = result.stream().sorted(Comparator.comparing(EquipmentMachingDto::getCollectTime)).collect(Collectors.toList());
        }
        if (result == null || result.isEmpty()) {
            return null;
        }