修改了对应代码

fei

13 小时以前 f41e9a8dd4aa5de0de323ffe2377c896cb44ea37

 archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java

@@ -6,10 +6,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ArchiveCategory;
import com.ruoyi.domain.ArchiveRecords;
import com.ruoyi.domain.DocumentMaterials;
import com.ruoyi.domain.vo.*;
import com.ruoyi.mapper.DocumentMaterialsMapper;
@@ -40,6 +42,9 @@
                .like(!StringUtils.isEmpty(documentMaterials.getPublicity()), DocumentMaterials::getPublicity, documentMaterials.getPublicity())
                .like(!StringUtils.isEmpty(documentMaterials.getRetentionPeriod()), DocumentMaterials::getRetentionPeriod, documentMaterials.getRetentionPeriod())
                .like(!StringUtils.isEmpty(documentMaterials.getSecurityLevel()), DocumentMaterials::getSecurityLevel, documentMaterials.getSecurityLevel())
                .like(!StringUtils.isEmpty(documentMaterials.getTitle()), DocumentMaterials::getTitle, documentMaterials.getTitle())


                .eq(documentMaterials.getDate()!=null, DocumentMaterials::getDate, documentMaterials.getDate())
                .eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId())
        .eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
@@ -148,59 +153,79 @@
    }

    @Override
    public List<DocumentMaterials> selectDocumentMaterialsByIds(Long[] ids) {
        // 获取当前用户ID
        Long userid = SecurityUtils.getUserId();

        // 创建查询条件
        LambdaQueryWrapper<DocumentMaterials> lambdaQueryWrapper = new LambdaQueryWrapper<>();

        // 根据ids查询
        lambdaQueryWrapper.in(DocumentMaterials::getMaterialId, Arrays.asList(ids));
        lambdaQueryWrapper.orderByAsc(DocumentMaterials::getPageNumber);
        // 如果不是管理员，需要考虑权限过滤（可根据实际权限需求调整）
        if (userid != 1) {
            // 这里可以添加权限相关的过滤条件
        }

        List<DocumentMaterials> beanRecords = list(lambdaQueryWrapper);
        return beanRecords;
    }

    @Override
    public int updateDocumentMaterials(DocumentMaterials documentMaterials) {
        boolean result = false;
        try {

            //修改页号成功之后，要重新生成文件材料序号，页次
            //根据pageNumber拿到title，然后计算pageOrder
            LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
            lqw.eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId());
            lqw.eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
            List<DocumentMaterials> records = list(lqw);
//            //修改页号成功之后，要重新生成文件材料序号，页次
//            //根据pageNumber拿到title，然后计算pageOrder
//            LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
//            lqw.eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId());
//            lqw.eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
//            List<DocumentMaterials> records = list(lqw);



            //计算pageOrder
            Long pageOrder = 1L;
            if(documentMaterials.getPageNumber().equals(1))
                pageOrder = 1L;
            else {
                Long maxPOrder = this.baseMapper.getMaxPageOrder(records.get(0).getTitle(), documentMaterials.getPageNumber(), records.get(0).getStage(), documentMaterials.getRecordId());
                if (maxPOrder != null)
                    pageOrder = maxPOrder + 1;
            }
            //设置pageOrder
            documentMaterials.setPageOrder(pageOrder);
            //计算fileNumber
            Long fileNumber = this.getFiNum(documentMaterials.getPageNumber(), documentMaterials.getRecordId());
            documentMaterials.setFileNumber(fileNumber);
//
//            //计算pageOrder
//            Long pageOrder = 1L;
//            if(documentMaterials.getPageNumber().equals(1))
//                pageOrder = 1L;
//            else {
//                Long maxPOrder = this.baseMapper.getMaxPageOrder(records.get(0).getTitle(), documentMaterials.getPageNumber(), records.get(0).getStage(), documentMaterials.getRecordId());
//                if (maxPOrder != null)
//                    pageOrder = maxPOrder + 1;
//            }
//            //设置pageOrder
//            documentMaterials.setPageOrder(pageOrder);
//            //计算fileNumber
//            Long fileNumber = this.getFiNum(documentMaterials.getPageNumber(), documentMaterials.getRecordId());
//            documentMaterials.setFileNumber(fileNumber);
            //修改页号
            result = updateById(documentMaterials);
            //把剩下所有的的fileNumber和pageOrder都更新一遍
            LambdaQueryWrapper<DocumentMaterials> lqw1 = new LambdaQueryWrapper<>();
            lqw.eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId());
          //  lqw.eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
            List<DocumentMaterials> recordss = list(lqw1);
            for(DocumentMaterials dt: recordss)
            {
                //计算pageOrder
                Long pageOrder1 = 1L;
                if(dt.getPageNumber().equals(1))
                    pageOrder1 = 1L;
                else {
                    Long maxPOrder1 = this.baseMapper.getMaxPageOrder(dt.getTitle(), dt.getPageNumber(), dt.getStage(), dt.getRecordId());
                    if (maxPOrder1 != null)
                        pageOrder1 = maxPOrder1 + 1;
                }
                //设置pageOrder
                dt.setPageOrder(pageOrder1);
                //计算fileNumber
                Long fileNumber1 = this.getFiNum(dt.getPageNumber(), dt.getRecordId());
                dt.setFileNumber(fileNumber1);
                //修改页号
                updateById(dt);
            }
//            //把剩下所有的的fileNumber和pageOrder都更新一遍
//            LambdaQueryWrapper<DocumentMaterials> lqw1 = new LambdaQueryWrapper<>();
//            lqw.eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId());
//          //  lqw.eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
//            List<DocumentMaterials> recordss = list(lqw1);
//            for(DocumentMaterials dt: recordss)
//            {
//                //计算pageOrder
//                Long pageOrder1 = 1L;
//                if(dt.getPageNumber().equals(1))
//                    pageOrder1 = 1L;
//                else {
//                    Long maxPOrder1 = this.baseMapper.getMaxPageOrder(dt.getTitle(), dt.getPageNumber(), dt.getStage(), dt.getRecordId());
//                    if (maxPOrder1 != null)
//                        pageOrder1 = maxPOrder1 + 1;
//                }
//                //设置pageOrder
//                dt.setPageOrder(pageOrder1);
//                //计算fileNumber
//                Long fileNumber1 = this.getFiNum(dt.getPageNumber(), dt.getRecordId());
//                dt.setFileNumber(fileNumber1);
//                //修改页号
//                updateById(dt);
//            }


        } catch (Exception e) {
@@ -299,4 +324,116 @@
        else
            return null;
    }

    @Override
    public boolean isPageNumberIslegal(Integer recordId) {
        return this.baseMapper.isPageNumberLegal(recordId);
    }

    @Override
    public int getFileCount(Integer recordId) {
        return this.baseMapper.getCount(recordId);
    }
    
    @Override
    public AjaxResult addMiddleRecordsByPageNumbers(Long recordId, Long maxPageNumber) {
        try {
            // 获取指定recordId下的所有记录，按页号升序排列
            LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
            lqw.eq(DocumentMaterials::getRecordId, recordId);
            lqw.orderByAsc(DocumentMaterials::getPageNumber);
            List<DocumentMaterials> records = this.list(lqw);

            if (records == null || records.isEmpty()) {
                return AjaxResult.success("没有找到指定记录");
            }
            
            List<DocumentMaterials> middleRecords = new ArrayList<>();
            
            // 遍历记录，找出需要添加中间页号的位置
            for (int i = 0; i < records.size() - 1; i++) {
                DocumentMaterials currentRecord = records.get(i);
                DocumentMaterials nextRecord = records.get(i + 1);
                
                long currentPage = currentRecord.getPageNumber();
                long nextPage = nextRecord.getPageNumber();
                
                // 如果当前页号和下一页号之间有间隔
                if (nextPage - currentPage > 1) {
                    // 添加中间页号的记录，信息与当前记录保持一致
                    for (long page = currentPage + 1; page < nextPage; page++) {
                        DocumentMaterials newRecord = new DocumentMaterials();
                        // 复制当前记录的所有属性
                        BeanUtils.copyBeanProp(newRecord, currentRecord);
                        // 设置新的页号
                        newRecord.setPageNumber(page);
                        // 清除ID，确保是新记录
                        newRecord.setMaterialId(null);
                        // 设置创建时间
                        newRecord.setCreatedAt(new Date());
                        // 重置文件材料序号为null，让系统自动生成
                        newRecord.setFileNumber(null);
                        // 重置页次为null，让系统自动生成
                        newRecord.setPageOrder(null);
                        // 重置图像相关字段，以便上传文件时更新
                        newRecord.setSizeType(null);
                        newRecord.setWidth(null);
                        newRecord.setHeight(null);
                        newRecord.setHorizontalResolution(null);
                        newRecord.setVerticalResolution(null);
                        newRecord.setFileSize(null);
                        newRecord.setFormat(null);
                        newRecord.setUrl(null);
                        // 添加到中间记录列表
                        middleRecords.add(newRecord);
                    }
                }
            }
            
            // 处理最后一条记录到maxPageNumber之间的间隔
            DocumentMaterials lastRecord = records.get(records.size() - 1);
            long lastPage = lastRecord.getPageNumber();
            
            if (maxPageNumber > lastPage) {
                // 添加从lastPage+1到maxPageNumber之间的中间记录
                for (long page = lastPage + 1; page <= maxPageNumber; page++) {
                    DocumentMaterials newRecord = new DocumentMaterials();
                    // 复制最后一条记录的所有属性
                    BeanUtils.copyBeanProp(newRecord, lastRecord);
                    // 设置新的页号
                    newRecord.setPageNumber(page);
                    // 清除ID，确保是新记录
                    newRecord.setMaterialId(null);
                    // 设置创建时间
                    newRecord.setCreatedAt(new Date());
                    // 重置文件材料序号为null，让系统自动生成
                    newRecord.setFileNumber(null);
                    // 重置页次为null，让系统自动生成
                    newRecord.setPageOrder(null);
                    // 重置图像相关字段，以便上传文件时更新
                    newRecord.setSizeType(null);
                    newRecord.setWidth(null);
                    newRecord.setHeight(null);
                    newRecord.setHorizontalResolution(null);
                    newRecord.setVerticalResolution(null);
                    newRecord.setFileSize(null);
                    newRecord.setFormat(null);
                    newRecord.setUrl(null);
                    // 添加到中间记录列表
                    middleRecords.add(newRecord);
                }
            }
            
            // 批量保存中间记录
            if (!middleRecords.isEmpty()) {
                this.saveBatch(middleRecords);
                return AjaxResult.success("成功添加中间记录", "添加数量：" + middleRecords.size());
            } else {
                return AjaxResult.success("没有需要添加的中间记录");
            }
        } catch (Exception e) {
            e.printStackTrace();
            return AjaxResult.error("添加中间记录失败：" + e.getMessage());
        }
    }
}