From a9015e429e40f83afdffd43552d34b82e67a75ff Mon Sep 17 00:00:00 2001 From: JYW <2013732181@qq.com> Date: 星期一, 29 四月 2024 17:34:10 +0800 Subject: [PATCH] 2024-04-29 自定义注解,给每个接口加上自定义注解 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 44 +++++++++++--------------------------------- 1 files changed, 11 insertions(+), 33 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java index c5df3a3..aa72274 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java @@ -1,27 +1,24 @@ package com.yuanchu.mom.service.impl; -import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.dto.FactoryDto; +import com.yuanchu.mom.dto.SampleTypeDto; import com.yuanchu.mom.mapper.StandardMethodListMapper; import com.yuanchu.mom.mapper.StandardProductListMapper; -import com.yuanchu.mom.pojo.StandardMethodList; +import com.yuanchu.mom.mapper.StandardTreeMapper; import com.yuanchu.mom.pojo.StandardProductList; import com.yuanchu.mom.pojo.StandardTree; import com.yuanchu.mom.service.StandardMethodListService; import com.yuanchu.mom.service.StandardProductListService; import com.yuanchu.mom.service.StandardTreeService; -import com.yuanchu.mom.mapper.StandardTreeMapper; import lombok.AllArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -53,31 +50,6 @@ @Override @Transactional(rollbackFor = Exception.class) public int addStandardTree(StandardTree standardTree) { - List<StandardProductList> productList = standardTreeMapper.getStandardProductListBySample(standardTree.getSampleType()); - List<StandardMethodList> methodList = standardTreeMapper.getStandardMethodListBySample(standardTree.getSampleType()); - for (StandardMethodList standardMethod : methodList) { - standardMethod.setFactory(standardTree.getFactory()); - standardMethod.setLaboratory(standardTree.getLaboratory()); - standardMethod.setSampleType(standardTree.getSampleType()); - standardMethod.setSample(standardTree.getSample()); - standardMethod.setModel(standardTree.getModel()); - standardMethodListMapper.insert(standardMethod); - for (StandardProductList standardProductList : productList) { - standardProductList.setFactory(standardTree.getFactory()); - standardProductList.setLaboratory(standardTree.getLaboratory()); - standardProductList.setSampleType(standardTree.getSampleType()); - standardProductList.setSample(standardTree.getSample()); - standardProductList.setModel(standardTree.getModel()); - standardProductList.setStandardMethodListId(standardMethod.getId()); - standardProductList.setState(1); - standardProductList.setId(null); - standardProductList.setCreateUser(null); - standardProductList.setCreateTime(null); - standardProductList.setUpdateUser(null); - standardProductList.setUpdateTime(null); - standardProductListMapper.insert(standardProductList); - } - } return standardTreeMapper.insert(standardTree); } @@ -102,12 +74,12 @@ standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0])); break; } - Map<String, List<?>> listMap = standardMethodListService.selectsStandardMethodByFLSSM(tree); + Map<String, List<?>> listMap = standardMethodListService.selectsStandardMethodByFLSSM2(tree); if (listMap.get("standardMethodList").size() != 0) { for (Object o : listMap.get("standardMethodList")) { JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o)); - List<StandardProductList> list = standardProductListService.selectStandardProductListByMethodId((Integer) jsonObject.get("id")); - if(list.size()!=0){ + List<StandardProductList> list = standardProductListService.selectStandardProductListByMethodId((Integer) jsonObject.get("id"), tree); + if (list.size() != 0) { standardProductListMapper.deleteBatchIds(list); } } @@ -144,6 +116,12 @@ } return 1; } + + @Override + public List<SampleTypeDto> getStandardTree2() { + return standardTreeMapper.getStandardTree2(); + } + } -- Gitblit v1.9.3