产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
chenhj
2026-04-24 ffe4413db421aabb7446007ff76d4e9943c6fc84 
 src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerServiceImpl.java


@@ -8,7 +8,6 @@


import com.ruoyi.common.enums.FileNameType;


import com.ruoyi.common.utils.StringUtils;


import com.ruoyi.common.utils.poi.ExcelUtil;


import com.ruoyi.framework.web.domain.AjaxResult;


import com.ruoyi.measuringinstrumentledger.dto.MeasuringInstrumentLedgerDto;


import com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerMapper;


import com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerRecordMapper;


@@ -21,13 +20,13 @@


import com.ruoyi.project.system.mapper.SysUserMapper;


import com.ruoyi.sales.mapper.CommonFileMapper;


import com.ruoyi.sales.pojo.CommonFile;


import jakarta.servlet.http.HttpServletResponse;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.io.FilenameUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;




import javax.servlet.http.HttpServletResponse;


import java.io.IOException;


import java.nio.file.Files;


import java.nio.file.Path;


@@ -48,22 +47,14 @@


 */


@Service


@Slf4j


@RequiredArgsConstructor


public class MeasuringInstrumentLedgerServiceImpl extends ServiceImpl<MeasuringInstrumentLedgerMapper, MeasuringInstrumentLedger> implements MeasuringInstrumentLedgerService {




    @Autowired


    private MeasuringInstrumentLedgerMapper measuringInstrumentLedgerMapper;




    @Autowired


    private MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;




    @Autowired


    private TempFileMapper tempFileMapper;




    @Autowired


    private CommonFileMapper commonFileMapper;




    @Autowired


    private SysUserMapper sysUserMapper;


    private final MeasuringInstrumentLedgerMapper measuringInstrumentLedgerMapper;


    private final MeasuringInstrumentLedgerRecordMapper measuringInstrumentLedgerRecordMapper;


    private final TempFileMapper tempFileMapper;


    private final CommonFileMapper commonFileMapper;


    private final SysUserMapper sysUserMapper;




    @Value("${file.upload-dir}")


    private String uploadDir;


@@ -71,18 +62,23 @@


    @Override


    public IPage<MeasuringInstrumentLedger> listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {


        IPage<MeasuringInstrumentLedger> measuringInstrumentLedgerIPage = measuringInstrumentLedgerMapper.listPage(page, measuringInstrumentLedger);


        List<Integer>  types = new ArrayList<>();


        types.add(FileNameType.MEASURING.getValue());


        types.add(FileNameType.MEASURINGRecord.getValue());


        measuringInstrumentLedgerIPage.getRecords().forEach(item -> {


            LambdaQueryWrapper<MeasuringInstrumentLedgerRecord> measuringInstrumentLedgerRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();


            measuringInstrumentLedgerRecordLambdaQueryWrapper.eq(MeasuringInstrumentLedgerRecord::getMeasuringInstrumentLedgerId, item.getId());


            List<MeasuringInstrumentLedgerRecord> measuringInstrumentLedgerRecords = measuringInstrumentLedgerRecordMapper.selectList(measuringInstrumentLedgerRecordLambdaQueryWrapper);


            List<Long> collect = new ArrayList<>();


            if(!CollectionUtils.isEmpty(measuringInstrumentLedgerRecords)){


                List<Long> collect = measuringInstrumentLedgerRecords.stream().map(MeasuringInstrumentLedgerRecord::getId).collect(Collectors.toList());


                collect.add(item.getId());


                LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();


                salesLedgerFileWrapper.in(CommonFile::getCommonId, collect);


                List<CommonFile> commonFiles = commonFileMapper.selectList(salesLedgerFileWrapper);


                item.setCommonFiles(commonFiles);


                collect = measuringInstrumentLedgerRecords.stream().map(MeasuringInstrumentLedgerRecord::getId).collect(Collectors.toList());


            }


            collect.add(item.getId());


            LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();


            salesLedgerFileWrapper.in(CommonFile::getCommonId, collect)


                    .in(CommonFile::getType,types);


            List<CommonFile> commonFiles = commonFileMapper.selectList(salesLedgerFileWrapper);


            item.setCommonFiles(commonFiles);




        });


        return measuringInstrumentLedgerIPage;


@@ -184,12 +180,15 @@




            try {


                // 执行文件迁移（使用原子操作确保安全性）


                Files.move(


                        Paths.get(tempFile.getTempPath()),


                        formalFilePath,


                        StandardCopyOption.REPLACE_EXISTING,


                        StandardCopyOption.ATOMIC_MOVE


                );


//                Files.move(


//                        Paths.get(tempFile.getTempPath()),


//                        formalFilePath,


//                        StandardCopyOption.REPLACE_EXISTING,


//                        StandardCopyOption.ATOMIC_MOVE


//                );


                // 原子移动失败，使用复制+删除


                Files.copy(Paths.get(tempFile.getTempPath()), formalFilePath, StandardCopyOption.REPLACE_EXISTING);


                Files.deleteIfExists(Paths.get(tempFile.getTempPath()));


                log.info("文件迁移成功: {} -> {}", tempFile.getTempPath(), formalFilePath);




                // 更新文件记录（关联到业务ID）