From bdd0875d4b13a3f1ef472f64d4b6a95e0ef64b22 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期六, 19 八月 2023 10:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/develop'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 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 1307c01..cfcd078 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
@@ -10,6 +10,8 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.mdc.dto.EquipmentTemperatureDto;
+import org.jeecg.modules.mdc.dto.MdcEquDepDto;
+import org.jeecg.modules.mdc.dto.MdcEquProDto;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcEquipmentMapper;
@@ -634,7 +636,7 @@
}
/**
- * 鏍规嵁浜х嚎灞傜骇鏌ヨ璁惧鍗曚釜
+ * 鏍规嵁浜х嚎灞傜骇鏌ヨ璁惧鍗曚釜
*/
@Override
public MdcEquipment getEquipmentByPid(String pid, String userId) {
@@ -645,4 +647,38 @@
return null;
}
+ /**
+ * 鏍规嵁璁惧缂栧彿鏌ヨ璁惧淇℃伅鍜岄儴闂ㄤ俊鎭�
+ *
+ * @param equipmentIdList
+ * @return
+ */
+ @Override
+ public List<MdcEquDepDto> findEquDepList(List<String> equipmentIdList) {
+ return this.baseMapper.findEquDepList(equipmentIdList);
+ }
+
+ /**
+ * 鏍规嵁璁惧缂栧彿鏌ヨ璁惧淇℃伅鍜屼骇绾夸俊鎭�
+ *
+ * @param equipmentIdList
+ * @return
+ */
+ @Override
+ public List<MdcEquProDto> findEquProList(List<String> equipmentIdList) {
+ return this.baseMapper.findEquProList(equipmentIdList);
+ }
+
+ /**
+ * 鏍规嵁閮ㄩ棬灞傜骇鏌ヨ璁惧鍗曚釜
+ */
+ @Override
+ public MdcEquipment getEquipmentByDepPid(String pid, String userId) {
+ List<String> idsByDepart = this.getEquipmentIdsByDepart(userId, pid);
+ if (idsByDepart != null && !idsByDepart.isEmpty()) {
+ return super.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, idsByDepart.get(0)));
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.3