Merge remote-tracking branch 'origin/master'

value

2024-04-29 8577a11e5093871b2b5d6988431e7e22e76d43e6

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java

@@ -3,15 +3,19 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;

/**
@@ -26,6 +30,10 @@

    private StandardProductListMapper standardProductListMapper;

    private StandardTreeMapper standardTreeMapper;

    private StandardProductListService standardProductListService;

    @Override
    public int upStandardProductList(StandardProductList list) {
        return standardProductListMapper.updateById(list);
@@ -38,16 +46,75 @@

    @Override
    public List<StandardProductList> selectStandardProductList(InsSample insSample) {
        List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, insSample.getFactory()).eq(StandardProductList::getLaboratory, insSample.getLaboratory()).eq(StandardProductList::getSampleType, insSample.getSampleType()).eq(StandardProductList::getSample, insSample.getSample()).eq(StandardProductList::getModel, insSample.getModel()));
        if (list.size() == 0) {
            list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, insSample.getFactory()).eq(StandardProductList::getLaboratory, insSample.getLaboratory()).eq(StandardProductList::getSampleType, insSample.getSampleType()).eq(StandardProductList::getSample, insSample.getSample()));
        List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1));
        list = list.stream().filter(a -> {
            try {
                list = list.stream().filter(a -> {
                    String[] split = a.getSection().split("~");
                    return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[1])) < 1;
                }).collect(Collectors.toList());
            } catch (Exception e) {}
                if (a.getSection() != null && !Objects.equals(a.getSection(), "")) {
                    if (a.getSection().contains("~")) {
                        String[] split = a.getSection().split("~");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[1])) < 1;
                    } else if (a.getSection().contains("≥") || a.getSection().contains(">=")) {
                        String param = a.getSection().replace("≥", "").replace(">=", "");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) > -1;
                    } else if (a.getSection().contains("≤") || a.getSection().contains("<=")) {
                        String param = a.getSection().replace("≤", "").replace("<=", "");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) < 1;
                    } else if (a.getSection().contains(">")) {
                        String param = a.getSection().replace(">", "");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) > 0;
                    } else if (a.getSection().contains("<")) {
                        String param = a.getSection().replace("<", "");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) < 0;
                    } else if (a.getSection().contains("=")) {
                        String param = a.getSection().replace("=", "");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) == 0;
                    }
                }
            } catch (Exception ignored) {
                return false;
            }
            return true;
        }).collect(Collectors.toList());
        return list;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
        String[] trees = tree.split(" - ");
        StringBuffer str = new StringBuffer();
        if (trees.length == 3) {
            str.append("\"").append(trees[2]).append("\"");
        } else {
            str.append("\"").append(trees[2]).append("\",\"").append(trees[3]).append("\"");
        }
        List<StandardProductList> list = standardTreeMapper.selectStandardProductListByTree(str + "");
        List<StandardProductList> standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
        for (StandardProductList sp : standardProductLists) {
            for (StandardProductList pl : list) {
                if (sp.getInspectionItem().equals(pl.getInspectionItem()) && sp.getInspectionItemSubclass().equals(pl.getInspectionItemSubclass())) {
                    pl.setId(sp.getId());
                    pl.setState(sp.getState());
                    pl.setFactory(sp.getFactory());
                    pl.setLaboratory(sp.getLaboratory());
                    pl.setSampleType(sp.getSampleType());
                    pl.setSample(sp.getSample());
                    pl.setModel(sp.getModel());
                    pl.setMethodS(sp.getMethodS());
                    break;
                }
            }
        }
        CompletableFuture.supplyAsync(() -> {
            standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree));
            standardProductListService.saveBatch(list);
            return null;
        }).thenAccept(res -> {
        }).exceptionally(e -> {
            e.printStackTrace();
            return null;
        });
        ;
        return list;
    }
}