From d0b97b5655a6cac1efbda08dad1d3019ed973923 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 21 五月 2025 12:04:16 +0800
Subject: [PATCH] 设备日志批量导出
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 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..cae42ff 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;
@@ -112,6 +111,9 @@
@Transactional(rollbackFor = Exception.class)
public void saveMdcEquipment(MdcEquipment mdcEquipment, String selectedDeparts, String selectedProduction) {
//step.1 淇濆瓨璁惧
+ if (StringUtils.isBlank(mdcEquipment.getAttribute())) {
+ mdcEquipment.setAttribute("0");
+ }
this.save(mdcEquipment);
//step.2 淇濆瓨鎵�灞為儴闂�
if (oConvertUtils.isNotEmpty(selectedDeparts)) {
@@ -463,23 +465,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);
+ }
}
}
@@ -749,6 +752,9 @@
if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
}
+ if (StringUtils.isNotBlank(vo.getAttribute())) {
+ queryWrapper.eq(MdcEquipment::getAttribute, vo.getAttribute());
+ }
List<MdcEquipment> list = super.list(queryWrapper);
// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList));
return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
@@ -905,4 +911,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);
+ }
+
}
--
Gitblit v1.9.3