| | |
|---|
| | | } |
|---|
| | | 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); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
