From 959e5318189e66ad58d07c5bb94789c815b4d2e9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 16 八月 2025 11:42:37 +0800
Subject: [PATCH] art: WebService服务端相关代码修改
---
src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 126 ++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 66 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 05d9f78..753837f 100644
--- a/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -59,15 +59,9 @@
@Resource
private MdcEquipmentDepartMapper mdcEquipmentDepartMapper;
@Resource
- private MdcProductionEquipmentMapper mdcProductionEquipmentMapper;
- @Resource
private ISysUserDepartService sysUserDepartService;
@Resource
- private IMdcUserProductionService mdcUserProductionService;
- @Resource
private ISysDepartService sysDepartService;
- @Resource
- private IMdcProductionService mdcProductionService;
@Resource
private IEquipmentWorkLineService equipmentWorkLineService;
@Resource
@@ -222,15 +216,15 @@
mdcEquipmentDepartMapper.delete(new LambdaQueryWrapper<MdcEquipmentDepart>().eq(MdcEquipmentDepart::getDepId, departId).in(MdcEquipmentDepart::getEquipmentId, equipmentIdList));
}
- @Override
- public void removeEquipmentForProduction(String productionId, String equipmentId) {
- mdcProductionEquipmentMapper.delete(new LambdaQueryWrapper<MdcProductionEquipment>().eq(MdcProductionEquipment::getProductionId, productionId).eq(MdcProductionEquipment::getEquipmentId, equipmentId));
- }
+// @Override
+// public void removeEquipmentForProduction(String productionId, String equipmentId) {
+// mdcProductionEquipmentMapper.delete(new LambdaQueryWrapper<MdcProductionEquipment>().eq(MdcProductionEquipment::getProductionId, productionId).eq(MdcProductionEquipment::getEquipmentId, equipmentId));
+// }
- @Override
- public void removeEquipmentsForProduction(String productionId, List<String> equipmentIdList) {
- mdcProductionEquipmentMapper.delete(new LambdaQueryWrapper<MdcProductionEquipment>().eq(MdcProductionEquipment::getProductionId, productionId).in(MdcProductionEquipment::getEquipmentId, equipmentIdList));
- }
+// @Override
+// public void removeEquipmentsForProduction(String productionId, List<String> equipmentIdList) {
+// mdcProductionEquipmentMapper.delete(new LambdaQueryWrapper<MdcProductionEquipment>().eq(MdcProductionEquipment::getProductionId, productionId).in(MdcProductionEquipment::getEquipmentId, equipmentIdList));
+// }
@Override
public List<MdcEquipmentTree> loadTreeListByDepart(String userId) {
@@ -703,22 +697,22 @@
return this.baseMapper.selectPage(page, queryWrapper);
}
- /**
- * 鏍规嵁鐖剁骇id閫掑綊鏌ヨ鎵�鏈変笅绾d闆嗗悎
- */
- private List<String> findAllProductions(String key) {
- List<String> productions = new ArrayList<>();
- List<MdcProduction> mdcProductions = mdcProductionService.queryProdByPid(key);
- if (mdcProductions != null && !mdcProductions.isEmpty()) {
- List<String> ids = mdcProductions.stream().map(MdcProduction::getId).collect(Collectors.toList());
- productions.addAll(ids);
- for (MdcProduction mdcProduction : mdcProductions) {
- List<String> allProductions = findAllProductions(mdcProduction.getId());
- productions.addAll(allProductions);
- }
- }
- return productions;
- }
+// /**
+// * 鏍规嵁鐖剁骇id閫掑綊鏌ヨ鎵�鏈変笅绾d闆嗗悎
+// */
+// private List<String> findAllProductions(String key) {
+// List<String> productions = new ArrayList<>();
+// List<MdcProduction> mdcProductions = mdcProductionService.queryProdByPid(key);
+// if (mdcProductions != null && !mdcProductions.isEmpty()) {
+// List<String> ids = mdcProductions.stream().map(MdcProduction::getId).collect(Collectors.toList());
+// productions.addAll(ids);
+// for (MdcProduction mdcProduction : mdcProductions) {
+// List<String> allProductions = findAllProductions(mdcProduction.getId());
+// productions.addAll(allProductions);
+// }
+// }
+// return productions;
+// }
/**
* 浜х嚎璁惧鏍戝～鍏呰澶囨暟鎹�
@@ -843,7 +837,7 @@
public IPage<MdcEquipment> pageList(Page<MdcEquipment> page, MdcEquipmentVo mdcEquipment, HttpServletRequest req) {
if (StringUtils.isNotBlank(mdcEquipment.getProductionName())) {
// 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
- List<String> productionIds = mdcProductionService.recursionChildren(mdcEquipment.getProductionName());
+ List<String> productionIds = factoryService.recursionChildren(mdcEquipment.getProductionName());
mdcEquipment.setProductionIds(productionIds);
}
return this.baseMapper.pageList(page, mdcEquipment);
@@ -919,38 +913,38 @@
public List<MdcEquipment> exportXlsList(MdcEquipmentVo mdcEquipment) {
if (StringUtils.isNotBlank(mdcEquipment.getProductionName())) {
// 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
- List<String> productionIds = mdcProductionService.recursionChildren(mdcEquipment.getProductionName());
+ List<String> productionIds = factoryService.recursionChildren(mdcEquipment.getProductionName());
mdcEquipment.setProductionIds(productionIds);
}
return this.baseMapper.exportXlsList(mdcEquipment);
}
- /**
- * 閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�
- *
- * @param ids
- * @return
- */
- @Override
- public List<MdcEquipmentTree> loadTreeListByProductionIds(String ids) {
- List<String> productionIds = Arrays.asList(ids.split(","));
- //鑾峰彇鎵�鏈変骇绾挎暟鎹�
- List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(MdcProduction::getProductionOrder));
- List<String> allProductionIds = new ArrayList<>();
- //鎵惧埌鎵�鏈変骇绾縤d鐨勪笂绾d
- if (!productionIds.isEmpty()) {
- for (String productionId : productionIds) {
- this.getAllProductionIds(productionList, productionId, allProductionIds);
- }
- }
- //杩囨护浜х嚎鏁版嵁
- List<MdcProduction> list = productionList.stream().filter((MdcProduction mdcProduction) -> allProductionIds.contains(mdcProduction.getId())).collect(Collectors.toList());
- //缁勮浜х嚎璁惧鏍�
- List<MdcEquipmentTree> treeList = FindsEquipmentProductionUtil.wrapEquipmentProductionTreeList(list);
- //濉厖璁惧鏁版嵁
- FillEquipmentByProduction(treeList);
- return treeList;
- }
+// /**
+// * 閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�
+// *
+// * @param ids
+// * @return
+// */
+// @Override
+// public List<MdcEquipmentTree> loadTreeListByProductionIds(String ids) {
+// List<String> productionIds = Arrays.asList(ids.split(","));
+// //鑾峰彇鎵�鏈変骇绾挎暟鎹�
+// List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(MdcProduction::getProductionOrder));
+// List<String> allProductionIds = new ArrayList<>();
+// //鎵惧埌鎵�鏈変骇绾縤d鐨勪笂绾d
+// if (!productionIds.isEmpty()) {
+// for (String productionId : productionIds) {
+// this.getAllProductionIds(productionList, productionId, allProductionIds);
+// }
+// }
+// //杩囨护浜х嚎鏁版嵁
+// List<MdcProduction> list = productionList.stream().filter((MdcProduction mdcProduction) -> allProductionIds.contains(mdcProduction.getId())).collect(Collectors.toList());
+// //缁勮浜х嚎璁惧鏍�
+// List<MdcEquipmentTree> treeList = FindsEquipmentProductionUtil.wrapEquipmentProductionTreeList(list);
+// //濉厖璁惧鏁版嵁
+// FillEquipmentByProduction(treeList);
+// return treeList;
+// }
/**
* 鏌ヨ鍗曡〃鏁版嵁
@@ -1061,21 +1055,21 @@
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));
+ List<Factory> factoryList = factoryService.list(new LambdaQueryWrapper<Factory>().eq(Factory::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(Factory::getSorter));
//鏍规嵁鐢ㄦ埛id鑾峰彇鎷ユ湁鐨勪骇绾夸俊鎭泦鍚�
- List<String> productionIds = mdcUserProductionService.queryProductionIdsByUserId(userId);
- List<String> allProductionIds = new ArrayList<>();
+ List<String> factoryIds = userFactoryService.queryFactoryIdsByUserId(userId);
+ List<String> allFactoryIds = new ArrayList<>();
//鎵惧埌鎵�鏈変骇绾縤d鐨勪笂绾d
- if (productionIds != null && !productionIds.isEmpty()) {
- for (String productionId : productionIds) {
- this.getAllProductionIds(productionList, productionId, allProductionIds);
+ if (factoryIds != null && !factoryIds.isEmpty()) {
+ for (String factoryId : factoryIds) {
+ this.getAllFactoryIds(factoryList, factoryId, allFactoryIds);
}
}
//鏍规嵁浜х嚎闆嗗悎鏌ユ壘鎵�鏈夎澶噄d
- if (allProductionIds.isEmpty()) {
+ if (allFactoryIds.isEmpty()) {
return null;
}
- List<MdcEquipment> equipmentIds = this.baseMapper.getEquipmentList(allProductionIds);
+ List<MdcEquipment> equipmentIds = this.baseMapper.getEquipmentList(allFactoryIds);
return equipmentIds;
}
--
Gitblit v1.9.3