1.设备优化 2.配煤计算器

liding

23 小时以前 f29c8786807015d78b9be8a33397f69478d92a76

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

@@ -16,6 +16,7 @@

import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

@@ -39,8 +40,8 @@
    @Override
    public IPage<CoalField> selectCoalFieldList(Page page, CoalFieldDto coalFieldDto) {
        LambdaQueryWrapper<CoalField> queryWrapper = new LambdaQueryWrapper<>();
        if (StringUtils.hasText(coalFieldDto.getFieldName())) {
            queryWrapper.like(CoalField::getFieldName, coalFieldDto.getFieldName());
        if (StringUtils.hasText(coalFieldDto.getSearchAll())) {
            queryWrapper.like(CoalField::getFieldName, coalFieldDto.getSearchAll());
        }
        queryWrapper.orderByDesc(CoalField::getCreateTime);
        return coalFieldMapper.selectPage(page, queryWrapper);
@@ -80,6 +81,11 @@
        return coalFieldMapper.selectList(null);
    }

    @Override
    public Set<String> getFieldNamesByNames(Set<String> fieldNames) {
        return coalFieldMapper.getFieldNamesByNames(fieldNames);
    }

    private String generateNextFieldNumber() {
        // 获取所有已存在的 CoalField 记录，包括已删除的
        LambdaQueryWrapper<CoalField> queryWrapper = new LambdaQueryWrapper<>();