lius
2023-07-05 d7bbd0eb98734769cc8737915e0ed29daa5293b7
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
@@ -27,7 +27,7 @@
 * @Date: 2023-06-29
 */
@Service
public class MdcTorqueConfigServiceImpl extends ServiceImpl<MdcTorqueConfigMapper, MdcTorqueConfig> implements IMdcTorqueConfigService{
public class MdcTorqueConfigServiceImpl extends ServiceImpl<MdcTorqueConfigMapper, MdcTorqueConfig> implements IMdcTorqueConfigService {
    @Autowired
    private IMdcEquipmentService mdcEquipmentService;
@@ -59,38 +59,38 @@
    @Override
    public List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue, String equipmentId) {
        return this.baseMapper.findSpindleRunningCurve(torqueValue,equipmentId);
        return this.baseMapper.findSpindleRunningCurve(torqueValue, equipmentId);
    }
    @Override
    public IPage<MdcTorqueConfig> pageList(String userId, Page page, HttpServletRequest req, MdcTorqueConfig mdcTorqueConfig) {
        List<String> equipmentIds=new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcTorqueConfig.getParentId())&&StringUtils.isEmpty(mdcTorqueConfig.getEquipmentId())){
            if ("2".equals(mdcTorqueConfig.getTypeTree())){
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcTorqueConfig.getParentId()) && StringUtils.isEmpty(mdcTorqueConfig.getEquipmentId())) {
            if ("2".equals(mdcTorqueConfig.getTypeTree())) {
                //部门层级
                equipmentIds=mdcEquipmentService.getEquipmentIdsByDepart(userId,mdcTorqueConfig.getParentId());
            }else {
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcTorqueConfig.getParentId());
            } else {
                //产线层级
                equipmentIds=mdcEquipmentService.getEquipmentIdsProduction(userId,mdcTorqueConfig.getParentId());
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcTorqueConfig.getParentId());
            }
        }else if (StringUtils.isNotEmpty(mdcTorqueConfig.getEquipmentId())){
        } else if (StringUtils.isNotEmpty(mdcTorqueConfig.getEquipmentId())) {
            //单台设备信息
            mdcTorqueConfig.setMdcSectionIds(Collections.singletonList(mdcTorqueConfig.getEquipmentId()));
        }else {
        } else {
            //查询用户所拥有的所有设备信息
            if ("2".equals(mdcTorqueConfig.getTypeTree())){
            if ("2".equals(mdcTorqueConfig.getTypeTree())) {
                //部门层级
                equipmentIds=mdcEquipmentService.getEquipmentIdsByDepart(userId,null);
            }else {
                equipmentIds=mdcEquipmentService.getEquipmentIdsProduction(userId,null);
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
            } else {
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }
        if (mdcTorqueConfig.getMdcSectionIds()==null||mdcTorqueConfig.getMdcSectionIds().isEmpty()){
        if (mdcTorqueConfig.getMdcSectionIds() == null || mdcTorqueConfig.getMdcSectionIds().isEmpty()) {
            mdcTorqueConfig.setMdcSectionIds(equipmentIds);
        }
        if (mdcTorqueConfig.getMdcSectionIds()==null||mdcTorqueConfig.getMdcSectionIds().isEmpty()){
        if (mdcTorqueConfig.getMdcSectionIds() == null || mdcTorqueConfig.getMdcSectionIds().isEmpty()) {
            return null;
        }
        return this.baseMapper.pageList(page,mdcTorqueConfig);
        return this.baseMapper.pageList(page, mdcTorqueConfig);
    }
}