From cf396d3076a064998fbac84f76861f5ed918c5e5 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 03 四月 2025 15:18:34 +0800
Subject: [PATCH] minio修改
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index 6ae6729..3f60b21 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -202,7 +202,7 @@
}).collect(Collectors.toList());
List<BasicTreeDto> factoryList = new ArrayList<>();
factoryList.add(new BasicTreeDto(BasicTreeEnums.FACTORY_TYPE.getCode(),"涓ぉ绉戞妧","1",laboratoryTreeDtoList));
- return laboratoryTreeDtoList;
+ return factoryList;
}
@@ -238,16 +238,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public int delStandardTree(String tree) {
- String[] trees = tree.split(" - ");
- switch (trees.length) {
- case 5:
- if (trees[3].equals("null")) {
- standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).isNull(StandardTree::getSample).eq(StandardTree::getModel, trees[4]));
- } else {
- standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]).eq(StandardTree::getModel, trees[4]));
- }
- break;
+ public int delStandardTree(String level,String id) {
+ if(BasicTreeEnums.MODEL_TYPE.getCode().equals(level)){
+ modelMapper.deleteById(id);
}
return 1;
}
@@ -266,7 +259,7 @@
for (Model model : modelList) {
BasicTreeDto basicTreeDto = new BasicTreeDto();
basicTreeDto.setLevel(BasicTreeEnums.MODEL_TYPE.getCode());
- basicTreeDto.setValue(String.valueOf(model.getId()));
+ basicTreeDto.setValue(model.getModelName());
basicTreeDto.setLabel(model.getModelName());
basicTreeDto.setChildren(null);
if(model.getProductId() != null) {
@@ -293,7 +286,7 @@
Product::getObjectId,
Collectors.mapping(product -> {
BasicTreeDto basicTreeDto = new BasicTreeDto();
- basicTreeDto.setValue(String.valueOf(product.getId()));
+ basicTreeDto.setValue(product.getName());
basicTreeDto.setLabel(product.getName());
basicTreeDto.setLevel(BasicTreeEnums.PRODUCT_TYPE.getCode());
basicTreeDto.setChildren(productModelMap.get(product.getId()));
@@ -303,8 +296,9 @@
// 瀵规娴嬪璞″厛鎸夌収瀹為獙瀹ゅ湪鎸夌収妫�鏌ュ璞＄被鍒垎绫�
List<BasicTreeDto> testProjectBasicTreeList = structureTestObjectList.stream().map(structureTestObject -> {
BasicTreeDto basicTreeDto = new BasicTreeDto();
- basicTreeDto.setValue(String.valueOf(structureTestObject.getId()));
+ basicTreeDto.setValue(structureTestObject.getSpecimenName());
basicTreeDto.setLabel(structureTestObject.getSpecimenName());
+ basicTreeDto.setLevel(BasicTreeEnums.STRUCTURE_TEST_OBJECT_TYPE.getCode());
List<BasicTreeDto> children = new ArrayList<>();
if (!CollectionUtils.isEmpty(productMap.get(structureTestObject.getId()))) {
children.addAll(productMap.get(structureTestObject.getId()));
--
Gitblit v1.9.3