From fffa63eb736609e53c1d6b4d1ca9d353d639a532 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 25 三月 2025 14:17:00 +0800
Subject: [PATCH] 标准库树新增
---
basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java | 3 +
basic-server/src/main/java/com/ruoyi/basic/dto/ModelAddDto.java | 19 +++++++++
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 9 +---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 39 +++++++++++--------
4 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 45851ec..3927844 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -2,11 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.ruoyi.basic.dto.*;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.FactoryDto;
-import com.ruoyi.basic.dto.InsSampleReceiveDto;
-import com.ruoyi.basic.dto.ResetTreeDragDTO;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
import com.ruoyi.basic.pojo.StandardTree;
@@ -53,8 +50,8 @@
@ApiOperation(value = "娣诲姞鏍囧噯鏍�")
@PostMapping("/addStandardTree")
- public Result addStandardTree(@RequestBody StandardTree standardTree) {
- return Result.success(standardTreeService.addStandardTree(standardTree));
+ public Result addStandardTree(@RequestBody ModelAddDto modelAddDto) {
+ return Result.success(standardTreeService.addStandardTree(modelAddDto));
}
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ModelAddDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ModelAddDto.java
new file mode 100644
index 0000000..b86f254
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ModelAddDto.java
@@ -0,0 +1,19 @@
+package com.ruoyi.basic.dto;
+
+import com.ruoyi.basic.pojo.Model;
+import lombok.Data;
+
+@Data
+public class ModelAddDto extends Model {
+
+ /**
+ * 鐖跺眰绾�
+ */
+ private String parentLevel;
+
+ /**
+ * 鐖跺眰绾D
+ */
+ private String parentId;
+
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
index a7812b5..116b453 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.BasicTreeDto;
import com.ruoyi.basic.dto.FactoryDto;
+import com.ruoyi.basic.dto.ModelAddDto;
import com.ruoyi.basic.dto.SampleTypeDto;
import com.ruoyi.basic.pojo.StandardTree;
import org.springframework.web.multipart.MultipartFile;
@@ -20,7 +21,7 @@
List<BasicTreeDto> selectStandardTreeList();
- int addStandardTree(StandardTree standardTree);
+ int addStandardTree(ModelAddDto modelAddDto);
int delStandardTree(String tree);
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 4b99a25..2752eb5 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
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.*;
@@ -16,6 +15,7 @@
import com.ruoyi.basic.pojo.*;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.basic.service.*;
+import com.ruoyi.common.utils.StringUtils;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
@@ -208,23 +208,30 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public int addStandardTree(StandardTree standardTree) {
-
- LambdaQueryWrapper<StandardTree> wrapper = Wrappers.<StandardTree>lambdaQuery()
- .eq(StandardTree::getFactory, standardTree.getFactory())
- .eq(StandardTree::getLaboratory, standardTree.getLaboratory())
- .eq(StandardTree::getSampleType, standardTree.getSampleType())
- .eq(StandardTree::getSample, standardTree.getSample())
- .eq(StandardTree::getModel, standardTree.getModel());
- if (StringUtils.isNotBlank(standardTree.getSample())) {
- wrapper.eq(StandardTree::getSample, standardTree.getSample());
+ public int addStandardTree(ModelAddDto modelAddDto) {
+ // 鏍￠獙
+ if(StringUtils.isEmpty(modelAddDto.getParentId())){
+ throw new RuntimeException("缂哄皯鐖跺眰绾х粦瀹氬叧绯�");
}
-
- StandardTree tree = standardTreeMapper.selectOne(wrapper);
- if (tree != null) {
- throw new BaseException("璇ュ瀷鍙峰凡瀛樺湪");
+ Model model = new Model();
+ String parentLevel = modelAddDto.getParentLevel();
+ if(BasicTreeEnums.PRODUCT_TYPE.getCode().equals(parentLevel)){
+ model.setProductId(Integer.valueOf(parentLevel));
+ }else if(BasicTreeEnums.STRUCTURE_TEST_OBJECT_TYPE.getCode().equals(parentLevel)){
+ model.setStructureTestObjectId(Integer.valueOf(parentLevel));
+ }else {
+ throw new RuntimeException("鍨嬪彿鍙兘缁戝畾瀵硅薄鍜屼骇鍝�");
}
- return standardTreeMapper.insert(standardTree);
+ // 鍚嶇О閲嶈鎬ф牎楠�
+ QueryWrapper<Model> modelQueryWrapper = new QueryWrapper<>();
+ modelQueryWrapper.eq("product_id", model.getProductId());
+ modelQueryWrapper.eq("structure_test_object_id", model.getStructureTestObjectId());
+ modelQueryWrapper.eq("model_name", model.getModelName());
+ Model modelResult = modelMapper.selectOne(modelQueryWrapper);
+ if(ObjectUtils.isNotEmpty(modelResult)){
+ throw new RuntimeException("璇峰嬁娣诲姞閲嶅鍨嬪彿");
+ }
+ return modelMapper.insert(model);
}
@Override
--
Gitblit v1.9.3