From f2f8241dd52ef12ec109f6f4f0f13042055338ac Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 14 二月 2025 14:55:56 +0800
Subject: [PATCH] 修改指派设备 修改设备结构树权限 优化查询 优化排序
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java
index 6ad3383..1a7675d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcProductionEquipmentServiceImpl.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcProductionEquipmentService;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.MdcProductionEquipment;
@@ -13,6 +15,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author: LiuS
@@ -23,6 +26,8 @@
@Resource
private IMdcProductionService mdcProductionService;
+ @Resource
+ private IMdcEquipmentService mdcEquipmentService;
/**
* 鏍规嵁璁惧id鏌ヨ浜х嚎淇℃伅
@@ -54,4 +59,29 @@
}
return null;
}
+ /**
+ * 鏍规嵁鎸囧畾浜х嚎id鏌ヨ璁惧淇℃伅
+ */
+ @Override
+ public List<MdcEquipment> queryEquipmentsOfProduction(String productionId){
+ List<String> equipmentIds = this.list(new LambdaQueryWrapper<MdcProductionEquipment>().eq(MdcProductionEquipment::getProductionId, productionId))
+ .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
+ if (!equipmentIds.isEmpty()) {
+ return mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().in(MdcEquipment::getId, equipmentIds));
+ }
+ return null;
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾浜х嚎ids鏌ヨ璁惧淇℃伅
+ */
+ @Override
+ public List<MdcEquipment> queryEquipmentsOfProductions(List<String> productionIds){
+ List<String> equipmentIds = this.list(new LambdaQueryWrapper<MdcProductionEquipment>()
+ .in(MdcProductionEquipment::getProductionId, productionIds)).stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
+ if (!equipmentIds.isEmpty()) {
+ return mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().in(MdcEquipment::getId, equipmentIds));
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3