From c33eedaf999b84dd8377aba96d8aeeeba264b4f6 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期二, 09 九月 2025 15:07:35 +0800
Subject: [PATCH] mdc首页功能迁移
---
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 3964351..2682672 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
@@ -429,6 +431,9 @@
case 22:
mdcEquipmentMonitor.setOporationDict("鎶ヨ");
break;
+ case 5:
+ mdcEquipmentMonitor.setOporationDict("鏁呴殰");
+ break;
default:
mdcEquipmentMonitor.setOporationDict("鍏虫満");
break;
@@ -626,6 +631,21 @@
List<String> allProductionIdsByKey = partProduction.stream().filter(allProductionIds::contains).collect(Collectors.toList());
equipmentIds = this.baseMapper.queryIdsByProductions(allProductionIdsByKey);
}
+ return equipmentIds;
+ }
+
+ /**
+ * 鏌ヨ浜х嚎涓嬬殑鎵�鏈夎澶�
+ */
+ @Override
+ public List<String> getEquipmentIdsProduction(String key) {
+ List<String> partProduction = Lists.newArrayList();
+ if (StringUtils.isNotEmpty(key)) {
+ //key涓嶄负绌猴紝鏌ヨ鎵�鏈変笅绾т骇绾縤d
+ partProduction = this.findAllProductions(key);
+ partProduction.add(key);
+ }
+ List<String> equipmentIds = this.baseMapper.queryIdsByProductions(partProduction);
return equipmentIds;
}
@@ -1042,4 +1062,36 @@
return this.baseMapper.findByProIdsAndType(allProductionIds, typeList);
}
+ @Override
+ public List<MdcEquipment> getEquipmentList() {
+
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ if (StringUtils.isNotEmpty(user.getEquipmentIds())) {
+ return this.baseMapper.selectList(new LambdaQueryWrapper<MdcEquipment>().in(MdcEquipment::getEquipmentId, Arrays.asList(user.getEquipmentIds().split(StringPool.COMMA))));
+ }
+ //鑾峰彇鎵�鏈変骇绾挎暟鎹�
+ List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(MdcProduction::getProductionOrder));
+ //鏍规嵁鐢ㄦ埛id鑾峰彇鎷ユ湁鐨勪骇绾夸俊鎭泦鍚�
+ List<String> productionIds = mdcUserProductionService.queryProductionIdsByUserId(userId);
+ List<String> allProductionIds = new ArrayList<>();
+ //鎵惧埌鎵�鏈変骇绾縤d鐨勪笂绾d
+ if (productionIds != null && !productionIds.isEmpty()) {
+ for (String productionId : productionIds) {
+ this.getAllProductionIds(productionList, productionId, allProductionIds);
+ }
+ }
+ //鏍规嵁浜х嚎闆嗗悎鏌ユ壘鎵�鏈夎澶噄d
+ if (allProductionIds.isEmpty()) {
+ return null;
+ }
+ List<MdcEquipment> equipmentIds = this.baseMapper.getEquipmentList(allProductionIds);
+ return equipmentIds;
+ }
+
+ @Override
+ public List<String> getEquIdsByProIds(List<String> proIds) {
+ return this.baseMapper.getEquIdsByProIds(proIds);
+ }
+
}
--
Gitblit v1.9.3