产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
云
2 天以前 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java


@@ -10,6 +10,7 @@


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.ruoyi.account.service.AccountIncomeService;


import com.ruoyi.basic.dto.CustomerPrivatePoolDto;


import com.ruoyi.basic.dto.StorageBlobVO;


import com.ruoyi.basic.enums.ApplicationTypeEnum;


import com.ruoyi.basic.enums.RecordTypeEnum;


import com.ruoyi.basic.mapper.CustomerMapper;


@@ -28,7 +29,6 @@


import com.ruoyi.framework.security.LoginUser;


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


import com.ruoyi.other.mapper.TempFileMapper;


import com.ruoyi.other.pojo.TempFile;


import com.ruoyi.production.mapper.ProductionProductInputMapper;


import com.ruoyi.production.mapper.ProductionProductMainMapper;


import com.ruoyi.production.mapper.ProductionProductOutputMapper;


@@ -47,7 +47,6 @@


import com.ruoyi.sales.vo.SalesLedgerVo;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.io.FilenameUtils;


import org.jetbrains.annotations.Nullable;


import org.springframework.beans.BeanUtils;


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


@@ -57,15 +56,10 @@


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.multipart.MultipartFile;




import java.io.IOException;


import java.io.InputStream;


import java.lang.reflect.Field;


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.nio.file.Files;


import java.nio.file.Path;


import java.nio.file.Paths;


import java.nio.file.StandardCopyOption;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.YearMonth;


@@ -88,13 +82,11 @@


    private static final String LOCK_PREFIX = "contract_no_lock:";


    private static final long LOCK_WAIT_TIMEOUT = 10; // 锁等待超时时间（秒）


    private static final long LOCK_EXPIRE_TIME = 30;  // 锁自动过期时间（秒）


    private final AccountIncomeService accountIncomeService;


    private final SalesLedgerMapper salesLedgerMapper;


    private final CustomerMapper customerMapper;


    private final SalesLedgerProductMapper salesLedgerProductMapper;


    private final SalesLedgerProductServiceImpl salesLedgerProductServiceImpl;


    private final CommonFileMapper commonFileMapper;


    private final TempFileMapper tempFileMapper;


    private final ReceiptPaymentMapper receiptPaymentMapper;


    private final ShippingInfoServiceImpl shippingInfoServiceImpl;


    private final CommonFileServiceImpl commonFileService;


@@ -102,15 +94,9 @@


    private final InvoiceLedgerMapper invoiceLedgerMapper;


    private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;


    private final InvoiceRegistrationMapper invoiceRegistrationMapper;


    private final ProductionProductMainMapper productionProductMainMapper;


    private final ProductionProductOutputMapper productionProductOutputMapper;


    private final ProductionProductInputMapper productionProductInputMapper;


    private final QualityInspectMapper qualityInspectMapper;


    private final ProductModelMapper productModelMapper;


    private final RedisTemplate<String, String> redisTemplate;


    private final SysDeptMapper sysDeptMapper;


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


    private String uploadDir;


    private final ProductionProductMainService productionProductMainService;


    private final PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;


    private final SysUserMapper sysUserMapper;


@@ -199,6 +185,9 @@


            resultDto.setProductData(products);


            resultDto.setSalesLedgerFiles(salesLedgerFiles);


        }


        // 5. 查询附件


        List<StorageBlobVO> StorageBlobVOs = fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.SALES_LEDGER, salesLedger.getId());


        resultDto.setStorageBlobVOs(StorageBlobVOs);


        return resultDto;


    }




@@ -617,81 +606,6 @@


            fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.SALES_LEDGER, salesLedger.getId(), salesLedgerDto.getStorageBlobDTOs());


        }


        return 1;


    }




    /**


     * 将临时文件迁移到正式目录


     *


     * @param businessId  业务ID（销售台账ID）


     * @param tempFileIds 临时文件ID列表


     * @throws IOException 文件操作异常


     */


    private void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException {


        if (CollectionUtils.isEmpty(tempFileIds)) {


            return;


        }




        // 构建正式目录路径（按业务类型和日期分组）


        String formalDir = uploadDir + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE);




        Path formalDirPath = Paths.get(formalDir);




        // 确保正式目录存在（递归创建）


        if (!Files.exists(formalDirPath)) {


            Files.createDirectories(formalDirPath);


        }




        for (String tempFileId : tempFileIds) {


            // 查询临时文件记录


            TempFile tempFile = tempFileMapper.selectById(tempFileId);


            if (tempFile == null) {


                log.warn("临时文件不存在，跳过处理: {}", tempFileId);


                continue;


            }




            // 构建正式文件名（包含业务ID和时间戳，避免冲突）


            String originalFilename = tempFile.getOriginalName();


            String fileExtension = FilenameUtils.getExtension(originalFilename);


            String formalFilename = businessId + "_" +


                    System.currentTimeMillis() + "_" +


                    UUID.randomUUID().toString().substring(0, 8) +


                    (StringUtils.hasText(fileExtension) ? "." + fileExtension : "");




            Path formalFilePath = formalDirPath.resolve(formalFilename);




            try {


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


//                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）


                CommonFile fileRecord = new CommonFile();


                fileRecord.setCommonId(businessId);


                fileRecord.setName(originalFilename);


                fileRecord.setUrl(formalFilePath.toString());


                fileRecord.setCreateTime(LocalDateTime.now());


                //销售


                fileRecord.setType(FileNameType.SALE.getValue());


                commonFileMapper.insert(fileRecord);




                // 删除临时文件记录


                tempFileMapper.deleteById(tempFile);




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


            } catch (IOException e) {


                log.error("文件迁移失败: {}", tempFile.getTempPath(), e);


                // 可选择回滚事务或记录失败文件


                throw new IOException("文件迁移异常", e);


            }


        }


    }




    // 文件迁移方法