feat: 1.检验单详情温湿度 2.报告编制样品外观.平均值优化

liding

2 天以前 bd46f203b0d30a3d33b7c51ae9a528e4807477e1

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java

@@ -1,7 +1,6 @@
package com.ruoyi.basic.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,7 +9,6 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.basic.dto.CopyStandardProductListDto;
import com.ruoyi.basic.dto.InsSampleReceiveDto;
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ResetTreeDragDTO;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.mapper.StandardProductListMapper;
@@ -18,9 +16,9 @@
import com.ruoyi.basic.mapper.StandardTreeMapper;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardProductListService2;
import com.ruoyi.basic.utils.StandardTreePath;
import com.ruoyi.basic.utils.StandardTreePathParser;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,8 +43,6 @@

    private StandardTreeMapper standardTreeMapper;

    private StandardProductListService2 standardProductListService2;

    private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;

    private StandardProductListSupplierAskMapper standardProductListSupplierAskMapper;
@@ -57,20 +53,39 @@
        return standardProductListMapper.updateById(list);
    }

    @Override
    public int delStandardProduct(JSONArray list) {
        return standardProductListMapper.deleteBatchIds(list);
    }

    @Override
    public List<StandardProductList> selectStandardProductList(InsSampleReceiveDto insSample) {
        // 是否没有产品
        if (insSample == null || insSample.getStandardMethodListId() == null) {
            throw new BaseException("检验标准不能为空");
        }
        // 新疆新聚两级树优先按“行业 + 标准”规范路径查询；无法解析时保留历史五级逻辑。
        boolean twoLevelOrder = false;
        boolean isNoSample = false;
//        String[] models = insSample.getModel().split("-(?=[^-]*$)");//拆分最后一个【-】
        String model = insSample.getModel();
        String modelNum = insSample.getModelNum();
        List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, model, insSample.getIsCableTag());
        if (list.size() == 0) {
        List<StandardProductList> list = Collections.emptyList();
        if (StringUtils.isNotBlank(insSample.getFactory())) {
            try {
                StandardTreePath path = StandardTreePathParser.parse(insSample.getFactory());
                if (path.getStandard() != null) {
                    String canonicalTree = StandardTreePathParser.canonical(path.getIndustry(), path.getStandard());
                    list = standardProductListMapper.selectDetail2(
                            insSample.getStandardMethodListId(), 1, canonicalTree, insSample.getIsCableTag());
                    insSample.setLaboratory(path.getIndustry());
                    insSample.setSampleType(null);
                    insSample.setSample(path.getStandard());
                    insSample.setModel(null);
                    twoLevelOrder = true;
                }
            } catch (BaseException ignored) {
                // 历史五级路径继续走原有兼容查询。
            }
        }
        if (!twoLevelOrder) {
            list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, model, insSample.getIsCableTag());
        }
        if (!twoLevelOrder && list.size() == 0) {
            if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
                return null;
            }
@@ -92,8 +107,8 @@
                }
            }
        }
        String[] split1 = insSample.getFactory().split(" - ");
        if (!isNoSample) {
        if (!twoLevelOrder && !isNoSample) {
            String[] split1 = insSample.getFactory().split(" - ");
            //判断长度
            if (split1.length > 4) {
                if (ObjectUtils.isNotEmpty(split1[3])) {
@@ -103,9 +118,14 @@
                }
            }
        }
        final boolean currentTwoLevelOrder = twoLevelOrder;
        list = list.stream().filter(a -> {
                    try {
                        if (a.getSection() != null && !Objects.equals(a.getSection(), "")) {
                            // 两级下单不再输入型号，不能因无法计算型号区间而丢弃整个检验项。
                            if (currentTwoLevelOrder && StringUtils.isBlank(modelNum)) {
                                return true;
                            }
                            List<String> sections = JSON.parseArray(a.getSection(), String.class);// 区间
                            List<String> cores = JSON.parseArray(a.getCores(), String.class); // 芯数
                            List<String> conductorMaterials = JSON.parseArray(a.getConductorMaterial(), String.class); // 导体材质
@@ -139,7 +159,7 @@
                    }
                    return true;
                }).peek(standardProductList -> {
                    // todo: 判断是否是原材下单, 需要啊把颜色绑定到试样颜色的要求值上
                    //判断是否是原材下单, 需要啊把颜色绑定到试样颜色的要求值上
                    if (StringUtils.isNotBlank(insSample.getPartNo())) {
                        // 判断是否有这个字段且是文本类型
                        if (StringUtils.isNotBlank(standardProductList.getInspectionItem())
@@ -263,234 +283,151 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
        String[] trees = tree.split(" - ");
        try {
            String tree1 = trees[2];
        } catch (Exception e) {
            throw new BaseException("操作太快,系统传参错误!!!!");
    public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page, String keyword) {
        if (id == null) {
            throw new BaseException("检验标准不能为空");
        }
        boolean isDrag = false;
        List<StandardProductList> list = new ArrayList<>();
        if (trees.length == 3) {
            List<StandardTree> treeList = new ArrayList<>();
            StandardTree standardTree = new StandardTree();
            standardTree.setFactory(trees[0]);
            standardTree.setLaboratory(trees[1]);
            standardTree.setSampleType(trees[2]);
            List<ProductDto> pList = standardTreeMapper.selectPList(trees[2]);
            if (pList.size() == 0 || pList.get(0) == null) {
                List<StandardTree> treeList1 = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
                if (treeList1.size() == 0) {
                    treeList.add(standardTree);
                } else {
                    treeList.addAll(treeList1);
                }
            } else {
                for (ProductDto p : pList) {
                    standardTree.setSample(p.getName());
                    List<StandardTree> treeList1 = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, p.getName()));
                    if (treeList1.size() == 0) {
                        treeList.add(JSON.parseObject(JSON.toJSONString(standardTree), StandardTree.class));
                    } else {
                        treeList.addAll(treeList1);
                    }
                }
            }
            for (StandardTree standardTree2 : treeList) {
                String tree2 = trees[0] + " - " + trees[1] + " - " + trees[2] + " - " + standardTree2.getSample() + " - " + standardTree2.getModel();
                list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
                list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + standardTree2.getSample() + "\"", standardTree2.getSample(), standardTree2.getModel(), tree2, trees[1]));
            }
        } else if (trees.length == 4) {
            // 判断第四层是否有型号
            Long count = standardProductListMapper.selectCount(Wrappers.<StandardProductList>lambdaQuery()
                    .eq(StandardProductList::getStandardMethodListId, id)
                    .isNull(StandardProductList::getModel)
                    .like(StandardProductList::getTree, tree));
            if (count == 0) {
                isDrag = true;
            }

            isDrag = true;
            List<StandardTree> treeList = standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
            if (treeList.size() == 0) {
                StandardTree standardTree = new StandardTree();
                standardTree.setFactory(trees[0]);
                standardTree.setLaboratory(trees[1]);
                standardTree.setSampleType(trees[2]);
                standardTree.setSample(trees[3]);
                treeList.add(standardTree);
            }
            for (StandardTree standardTree : treeList) {
                String str = tree + " - " + standardTree.getModel();
                list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
                list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", standardTree.getSample(), standardTree.getModel(), str, trees[1]));
            }
        } else {
            isDrag = true;
            list.addAll(standardTreeMapper.selectStandardProductListByTree("\"" + trees[2] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
            list.addAll(standardTreeMapper.selectStandardProductListByTree2("\"" + trees[2] + "\",\"" + trees[3] + "\"", trees[3].equals("null") ? null : trees[3], trees[4], tree, trees[1]));
        StandardTreePath path = StandardTreePathParser.parse(tree);
        if (path.getStandard() == null) {
            throw new BaseException("请选择标准节点");
        }
        for (StandardProductList productList : list) {
            productList.setId(IdWorker.getId());
        }
        List<StandardProductList> standardProductLists;

        if (isDrag) {
            standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
                    .eq(StandardProductList::getStandardMethodListId, id)
                    .like(StandardProductList::getTree, tree)
                    .orderByAsc(StandardProductList::getSort));
            // 判断是否有没有序号的, 没有序号重置
            boolean b = standardProductLists.stream().anyMatch(standardProductList -> standardProductList.getSort() == null);
        } else {
            standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
                    .eq(StandardProductList::getStandardMethodListId, id)
                    .like(StandardProductList::getTree, tree));
        }

        for (StandardProductList sp : standardProductLists) {
            for (StandardProductList pl : list) {
                // 判断条件是否只有一个, 有一个的话默认第一个
                String radiusList = pl.getRadiusList();
                if (StringUtils.isNotBlank(radiusList) && !radiusList.equals("null") && !radiusList.equals("\"\"")) {
                    JSONArray jsonArray = JSON.parseArray(radiusList);
                    List<String> radius = jsonArray.toJavaList(String.class);
                    if (CollectionUtils.isNotEmpty(radius) && radius.size() == 1) {
                        pl.setRadius(radius.get(0));
                    }
                }
                if (Objects.equals(sp.getInspectionItem(), pl.getInspectionItem())
                        && Objects.equals((sp.getInspectionItemSubclass() == null) ? "" : sp.getInspectionItemSubclass(), pl.getInspectionItemSubclass() == null ? "" : pl.getInspectionItemSubclass())
//                        && Objects.equals(sp.getSample(), pl.getSample())
                        && Objects.equals(sp.getModel(), pl.getModel())
                        && sp.getTree().indexOf(pl.getSample() == null ? "null" : pl.getSample()) > -1
                        && Objects.equals(sp.getStructureItemParameterId(), pl.getStructureItemParameterId())) {
                    pl.setId(sp.getId());
                    // 添加排序字段
                    pl.setSort(sp.getSort());
                    if (sp.getState() != null && !sp.getState().equals("")) {
                        pl.setState(sp.getState());
                    } else {
                        pl.setState(id == 0 ? 1 : 0);
                    }
                    if (sp.getMethodS() != null && !sp.getMethodS().equals("")) {
                        pl.setMethod(sp.getMethodS());
                    }
                    if (sp.getRadius() != null && !sp.getRadius().equals("")) {
                        pl.setRadius(sp.getRadius());
                    }
                    if (sp.getRates() != null && !sp.getRates().equals("")) {
                        pl.setRates(sp.getRates());
                    }
                    if (sp.getAsk() != null && !sp.getAsk().equals("")) {
                        pl.setAsk(sp.getAsk());
                    }
                    if (sp.getTell() != null && !sp.getTell().equals("")) {
                        pl.setTell(sp.getTell());
                    }
                    if (sp.getPrice() != null && !sp.getPrice().equals("")) {
                        pl.setPrice(sp.getPrice());
                    }
                    if (sp.getManHour() != null && !sp.getManHour().equals("")) {
                        pl.setManHour(sp.getManHour());
                    }
                    if (sp.getSection() != null && !sp.getSection().equals("")) {
                        pl.setSection(sp.getSection());
                    }
                    if (sp.getCores() != null && !sp.getCores().equals("")) {
                        pl.setCores(sp.getCores());
                    }
                    if (sp.getConductorMaterial() != null && !sp.getConductorMaterial().equals("")) {
                        pl.setConductorMaterial(sp.getConductorMaterial());
                    }
                    if (sp.getConductorType() != null && !sp.getConductorType().equals("")) {
                        pl.setConductorType(sp.getConductorType());
                    }
                    if (sp.getTemplateId() != null && !sp.getTemplateId().equals("")) {
                        pl.setTemplateId(sp.getTemplateId());
                    }
                    //因为还有个产品叫耐张线夹 接续金具 ,这两个项目的数据完全一样,特殊处理
                    if (sp.getTree() != null && !sp.getTree().equals("") && !pl.getTree().equals("中天科技检测中心 - 电力产品实验室 - 金具 - 耐张线夹 - null")) {
                        pl.setTree(sp.getTree());
                    }
                    break;
                }
            }
        }
        if (page == 1) {
            Integer userId = SecurityUtils.getUserId().intValue();
//            CompletableFuture.supplyAsync(() -> {
            if (trees.length == 5) {
                standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
        String canonicalTree = StandardTreePathParser.canonical(path.getIndustry(), path.getStandard());
        List<StandardProductList> generated = standardTreeMapper.selectStandardProductListByIndustry(
                path.getIndustry(), path.getStandard(), canonicalTree);
        List<StandardProductList> saved = standardProductListMapper.selectList(
                Wrappers.<StandardProductList>lambdaQuery()
                        .eq(StandardProductList::getStandardMethodListId, id)
                        .eq(StandardProductList::getTree, tree));
            } else {
                standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
                        .eq(StandardProductList::getStandardMethodListId, id)
                        .like(StandardProductList::getTree, tree));
            }
                        .eq(StandardProductList::getTree, canonicalTree)
                        .orderByAsc(StandardProductList::getSort));

            try {
                standardProductListService2.saveBatch(list.stream().map(a -> {
                    a.setFactory(trees[0]);
                    a.setLaboratory(trees[1]);
                    a.setSampleType(trees[2]);
                    a.setCreateUser(userId);
                    a.setUpdateUser(userId);
                    a.setStandardMethodListId(id);
                    return a;
                }).collect(Collectors.toList()));
            } catch (Exception e) {
                // 处理重复 ID 的记录，重新生成 ID 并继续尝试插入
                for (StandardProductList productList : list) {
                    productList.setId(IdWorker.getId());
                }
        Map<Integer, StandardProductList> savedByParameterId = new HashMap<>();
        for (StandardProductList item : saved) {
            if (item.getStructureItemParameterId() != null) {
                savedByParameterId.put(item.getStructureItemParameterId(), item);
            }

        }
        Map<String, Object> map = new HashMap<>();
        Collections.sort(list, (o1, o2) -> {
            String field1 = o1.getManHourGroup();
            String field2 = o2.getManHourGroup();

            boolean isEmpty1 = field1 == null || field1.isEmpty();
            boolean isEmpty2 = field2 == null || field2.isEmpty();

            if (isEmpty1 && isEmpty2) {
                return 0;
            } else if (isEmpty1) {
                return 1;
            } else if (isEmpty2) {
                return -1;
        Integer userId = SecurityUtils.getUserId().intValue();
        for (StandardProductList item : generated) {
            applySingleRadiusDefault(item);
            StandardProductList old = savedByParameterId.get(item.getStructureItemParameterId());
            if (old != null && sameInspectionItem(old, item)) {
                mergeSavedConfiguration(old, item);
            } else {
                int num1 = extractNumber(field1);
                int num2 = extractNumber(field2);
                return Integer.compare(num1, num2);
                item.setId(IdWorker.getId());
                item.setState(id == 0 ? 1 : 0);
            }
            item.setFactory(null);
            item.setLaboratory(path.getIndustry());
            item.setSampleType(null);
            item.setSample(path.getStandard());
            item.setModel(null);
            item.setTree(canonicalTree);
            item.setCreateUser(userId);
            item.setUpdateUser(userId);
            item.setStandardMethodListId(id);
        }

        standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaQuery()
                .eq(StandardProductList::getStandardMethodListId, id)
                .eq(StandardProductList::getTree, canonicalTree));
        if (CollectionUtils.isNotEmpty(generated)) {
            baseMapper.saveBatchProductLists(generated);
        }

        generated.sort((left, right) -> {
            int leftSort = left.getSort() == null ? Integer.MAX_VALUE : left.getSort();
            int rightSort = right.getSort() == null ? Integer.MAX_VALUE : right.getSort();
            if (leftSort != rightSort) {
                return Integer.compare(leftSort, rightSort);
            }
            return compareManHourGroup(left.getManHourGroup(), right.getManHourGroup());
        });
          // 按照索引排序
        if (isDrag) {
            list.sort((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
                    - (o2.getSort() == null ? 0 : o2.getSort()));
        }
        try {
            map.put("productList", list.subList((page - 1) * 300, page * 300));
        } catch (IndexOutOfBoundsException e) {
            map.put("productList", list.subList((page - 1) * 300, list.size()));
        }
        map.put("total", list.size());

        String search = keyword == null ? "" : keyword.trim().toLowerCase(Locale.ROOT);
        List<StandardProductList> filtered = generated.stream()
                .filter(item -> search.isEmpty()
                        || containsIgnoreCase(item.getInspectionItem(), search)
                        || containsIgnoreCase(item.getInspectionItemSubclass(), search))
                .collect(Collectors.toList());
        int total = filtered.size();
        int currentPage = page == null || page < 1 ? 1 : page;
        int fromIndex = Math.min((currentPage - 1) * 100, total);
        int toIndex = Math.min(fromIndex + 100, total);

        Map<String, Object> map = new HashMap<>();
        map.put("productList", new ArrayList<>(filtered.subList(fromIndex, toIndex)));
        map.put("total", total);
        return map;
    }

    private int extractNumber(String s) {
        // 从字符串中提取数字的逻辑，这里假设字段的格式是 "text<number>"
        String number = s;
        if (!s.matches("\\d+")) {
            number = s.replaceAll("\\D", "");
    private boolean sameInspectionItem(StandardProductList left, StandardProductList right) {
        return Objects.equals(left.getInspectionItem(), right.getInspectionItem())
                && Objects.equals(defaultString(left.getInspectionItemSubclass()), defaultString(right.getInspectionItemSubclass()));
    }

    private void applySingleRadiusDefault(StandardProductList item) {
        String radiusList = item.getRadiusList();
        if (StringUtils.isBlank(radiusList) || "null".equals(radiusList) || "\"\"".equals(radiusList)) {
            return;
        }
        return Integer.parseInt(number);
        try {
            List<String> values = JSON.parseArray(radiusList, String.class);
            if (values != null && values.size() == 1) {
                item.setRadius(values.get(0));
            }
        } catch (Exception ignored) {
            // 历史脏数据不影响检验项列表生成。
        }
    }

    private void mergeSavedConfiguration(StandardProductList old, StandardProductList target) {
        target.setId(old.getId());
        target.setSort(old.getSort());
        target.setState(old.getState() == null ? 0 : old.getState());
        if (StringUtils.isNotBlank(old.getMethodS())) {
            target.setMethodS(old.getMethodS());
            target.setMethod(old.getMethodS());
        }
        if (StringUtils.isNotBlank(old.getRadius())) target.setRadius(old.getRadius());
        if (StringUtils.isNotBlank(old.getRates())) target.setRates(old.getRates());
        if (StringUtils.isNotBlank(old.getAsk())) target.setAsk(old.getAsk());
        if (StringUtils.isNotBlank(old.getTell())) target.setTell(old.getTell());
        if (StringUtils.isNotBlank(old.getPrice())) target.setPrice(old.getPrice());
        if (StringUtils.isNotBlank(old.getManHour())) target.setManHour(old.getManHour());
        if (StringUtils.isNotBlank(old.getSection())) target.setSection(old.getSection());
        if (StringUtils.isNotBlank(old.getCores())) target.setCores(old.getCores());
        if (StringUtils.isNotBlank(old.getConductorMaterial())) target.setConductorMaterial(old.getConductorMaterial());
        if (StringUtils.isNotBlank(old.getConductorType())) target.setConductorType(old.getConductorType());
        if (old.getTemplateId() != null) target.setTemplateId(old.getTemplateId());
    }

    private int compareManHourGroup(String left, String right) {
        boolean leftEmpty = StringUtils.isBlank(left);
        boolean rightEmpty = StringUtils.isBlank(right);
        if (leftEmpty && rightEmpty) return 0;
        if (leftEmpty) return 1;
        if (rightEmpty) return -1;
        return Integer.compare(extractNumber(left), extractNumber(right));
    }

    private boolean containsIgnoreCase(String value, String search) {
        return value != null && value.toLowerCase(Locale.ROOT).contains(search);
    }

    private String defaultString(String value) {
        return value == null ? "" : value;
    }

    private int extractNumber(String s) {
        String number = s == null ? "" : s.replaceAll("\\D", "");
        if (number.isEmpty()) {
            return Integer.MAX_VALUE;
        }
        try {
            return Integer.parseInt(number);
        } catch (NumberFormatException ignored) {
            return Integer.MAX_VALUE;
        }
    }

    @Override
@@ -574,7 +511,7 @@

    @Override
    public void resetTreeDragBatch(List<StandardProductList> standardProductLists) {
        standardProductListService2.updateBatchById(standardProductLists);
        this.updateBatchById(standardProductLists);
    }

    /**