From 5ae1b71ab6b57140d46e6a8b9e606bb4a390ce27 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 03 三月 2025 11:11:46 +0800
Subject: [PATCH] webservice接口
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 9795fa8..6c195c4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/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 workshopId
+ * @return
+ */
+ @Override
+ public List<MdcEquipmentMonitor> getEquipmentMonitorList(String workshopId) {
+ return this.baseMapper.getEquipmentMonitorList(workshopId);
+ }
+
}
--
Gitblit v1.9.3