基础数据配置接口修改

mitao

2024-04-12 a7a8a50f48c1bff5ddc52b3bad1782328f8043d8

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java

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

import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
@@ -157,7 +158,56 @@
        if (CollUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page);
        }
        List<TbField> collect = page.getRecords().stream().peek(item -> {
            if (StringUtils.isBlank(item.getLevelTwoCategory())) {
                item.setLevelTwoCategory("无");
                item.setLevelThreeCategory("无");
            } else {
                item.setLevelThreeCategory("无");
            }
        }).collect(Collectors.toList());
        page.setRecords(collect);
        return PageDTO.of(page, FieldVO.class);
    }

    @Override
    public PageDTO<FieldVO> queryShowPage(FieldQuery query) {
        Page<TbField> page = this.lambdaQuery()
                .select(TbField::getId, TbField::getFieldName, TbField::getLevelOneCategory,
                        TbField::getLevelTwoCategory, TbField::getLevelThreeCategory)
                .like(StringUtils.isNotEmpty(query.getFieldName()), TbField::getFieldName,
                        query.getFieldName())
                .like(StringUtils.isNotEmpty(query.getLevelOneCategory()),
                        TbField::getLevelOneCategory, query.getLevelOneCategory())
                .like(StringUtils.isNotEmpty(query.getLevelTwoCategory()),
                        TbField::getLevelTwoCategory, query.getLevelTwoCategory())
                .like(StringUtils.isNotEmpty(query.getLevelThreeCategory()),
                        TbField::getLevelThreeCategory, query.getLevelThreeCategory())
                .eq(TbField::getStatus, ShowStatusEnum.SHOW)
                .eq(StringUtils.isNotNull(query.getFieldType()), TbField::getFieldType,
                        query.getFieldType())
                .orderByDesc(TbField::getCreateTime)
                .page(new Page<>(query.getPageNum(), query.getPageSize()));
        if (CollUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page);
        }
        List<TbField> collect = page.getRecords().stream().peek(item -> {
            if (StringUtils.isBlank(item.getLevelTwoCategory())) {
                item.setLevelTwoCategory("无");
                item.setLevelThreeCategory("无");
            } else {
                item.setLevelThreeCategory("无");
            }
        }).collect(Collectors.toList());
        page.setRecords(collect);
        return PageDTO.of(page, FieldVO.class);
    }

    @Override
    public List<FieldVO> listFields() {
        List<TbField> list = this.list(
                Wrappers.<TbField>lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW));
        return BeanUtils.copyList(list, FieldVO.class);
    }

    @Override
@@ -184,7 +234,7 @@
    }

    @Override
    public void update(FieldUpdateDTO dto) {
    public void editField(FieldUpdateDTO dto) {
        TbField field = this.getById(dto.getId());
        if (Objects.isNull(field)) {
            throw new ServiceException("参数异常");