看板设备状态概况及月利用路趋势接口

Lius

2025-03-03 75d26035001d85c12dc3ca93455b0fee477c3f77

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

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

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -463,23 +462,24 @@
            }
            result.put("runData", runData);

            //坐标信息
            // 查询坐标信息
            EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipmentDetailedDto.getEquipmentId());
            if (equipmentXYZ != null) {
                Map<String, Object> map = new HashMap<>();
                map.put("xmachine", equipmentXYZ.getXMachine());
                map.put("ymachine", equipmentXYZ.getYMachine());
                map.put("zmachine", equipmentXYZ.getZMachine());
                map.put("amachine", equipmentXYZ.getAMachine());
                map.put("bmachine", equipmentXYZ.getBMachine());
            if (!"ZUOLAN".equals(mdcEquipmentDetailedDto.getDriveType()) && !"CurrentState".equals(mdcEquipmentDetailedDto.getDriveType())) {
                EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipmentDetailedDto.getEquipmentId());
                if (equipmentXYZ != null) {
                    Map<String, Object> map = new HashMap<>();
                    map.put("xmachine", equipmentXYZ.getXMachine());
                    map.put("ymachine", equipmentXYZ.getYMachine());
                    map.put("zmachine", equipmentXYZ.getZMachine());
                    map.put("amachine", equipmentXYZ.getAMachine());
                    map.put("bmachine", equipmentXYZ.getBMachine());

                map.put("xabsolute", equipmentXYZ.getXAbsolute());
                map.put("yabsolute", equipmentXYZ.getYAbsolute());
                map.put("zabsolute", equipmentXYZ.getZAbsolute());
                map.put("aabsolute", equipmentXYZ.getAAbsolute());
                map.put("babsolute", equipmentXYZ.getBAbsolute());
                result.put("xyzList", map);
                    map.put("xabsolute", equipmentXYZ.getXAbsolute());
                    map.put("yabsolute", equipmentXYZ.getYAbsolute());
                    map.put("zabsolute", equipmentXYZ.getZAbsolute());
                    map.put("aabsolute", equipmentXYZ.getAAbsolute());
                    map.put("babsolute", equipmentXYZ.getBAbsolute());
                    result.put("xyzList", map);
                }
            }

        }
@@ -905,4 +905,15 @@
        return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
    }

    /**
     * 根据产线id获取设备状态列表
     *
     * @param productionId
     * @return
     */
    @Override
    public List<MdcEquipmentMonitor> getEquipmentMonitorList(String productionId) {
        return this.baseMapper.getEquipmentMonitorList(productionId);
    }

}