From f682213b9ff8a7d41ea16edfb1b68d996c46e080 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 29 三月 2025 14:03:36 +0800
Subject: [PATCH] 1.清除无用方法 2.检测项目预警修改 3.数采绑定调整
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 49 +++----------------------------------------------
1 files changed, 3 insertions(+), 46 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 3fe74d1..ad84b75 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
@@ -61,28 +61,14 @@
@Override
public List<FactoryDto> selectStandardTreeList() {
List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeList();
- // 鏀堕泦鎵�鏈� sampleTypeDto 鐨� value
- Set<String> sampleTypeValues = new HashSet<>();
for (FactoryDto factoryDto : factoryDtos) {
for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
laboratoryDto.getChildren().sort((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
- (o2.getSort() == null ? 0 : o2.getSort()));
for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
- sampleTypeValues.add(sampleTypeDto.getValue());
- }
- }
- }
- // 鎵归噺鏌ヨ鎵�鏈� sampleTypeDto 鐨勬暟鎹�
- List<SampleDto> standardList = standardTreeMapper.getStandardTree3Batch(sampleTypeValues);
- Map<String, List<SampleDto>> standardTreeMap = standardList.stream().collect(Collectors.groupingBy(SampleDto::getValue));
- // 灏嗘煡璇㈢粨鏋滃垎閰嶅埌瀵瑰簲鐨� sampleTypeDto
- for (FactoryDto factoryDto : factoryDtos) {
- for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
- for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
- List<SampleDto> standardTreeList = standardTreeMap.get(sampleTypeDto.getValue());
- if (standardTreeList != null) {
- sampleTypeDto.getChildren().addAll(standardTreeList);
- }
+// if (sampleTypeDto.getChildren().size() == 0) {
+ sampleTypeDto.getChildren().addAll(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
+// }
}
}
}
@@ -122,35 +108,6 @@
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;
- }
- return 1;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int addStandardProduct(String ids, String tree) {
- String[] trees = tree.split(" - ");
- JSONArray jsonArray = JSON.parseArray(ids);
- for (Object o : jsonArray) {
- StandardProductList standardProductList = standardTreeMapper.selectStandardProductById(Integer.parseInt("" + o));
- standardProductList.setFactory(trees[0]);
- try {
- standardProductList.setLaboratory(trees[1]);
- } catch (Exception e) {
- }
- try {
- standardProductList.setSampleType(trees[2]);
- } catch (Exception e) {
- }
- try {
- standardProductList.setSample(trees[3]);
- } catch (Exception e) {
- }
- try {
- standardProductList.setModel(trees[4]);
- } catch (Exception e) {
- }
- standardProductListMapper.insert(standardProductList);
}
return 1;
}
--
Gitblit v1.9.3