修复流水上传原始文件名保持

2026-05-06 15:05:36 +08:00
parent 2071d04c08
commit b2e177dd24
4 changed files with 862 additions and 15 deletions
--- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiFileUploadServiceImpl.java
+++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiFileUploadServiceImpl.java
@@ -659,7 +659,7 @@ public class CcdiFileUploadServiceImpl implements ICcdiFileUploadService {
                throw new RuntimeException("临时文件不存在: " + tempFilePath);
            }

-            UploadFileResponse uploadResponse = lsfxClient.uploadFile(lsfxProjectId, file);
+            UploadFileResponse uploadResponse = lsfxClient.uploadFile(lsfxProjectId, file, record.getFileName());
            if (uploadResponse == null || uploadResponse.getData() == null
                || uploadResponse.getData().getUploadLogList() == null
                || uploadResponse.getData().getUploadLogList().isEmpty()) {
@@ -673,7 +673,7 @@ public class CcdiFileUploadServiceImpl implements ICcdiFileUploadService {
            }

            log.info("【文件上传】文件上传成功: logId={}", logId);
-            processRecordAfterLogIdReady(projectId, lsfxProjectId, record, logId);
+            processRecordAfterLogIdReady(projectId, lsfxProjectId, record, logId, true);
            log.info("【文件上传】处理完成: fileName={}", record.getFileName());
            return true;

@@ -710,6 +710,14 @@ public class CcdiFileUploadServiceImpl implements ICcdiFileUploadService {
                                              Integer lsfxProjectId,
                                              CcdiFileUploadRecord record,
                                              Integer logId) {
+        processRecordAfterLogIdReady(projectId, lsfxProjectId, record, logId, false);
+    }
+
+    private void processRecordAfterLogIdReady(Long projectId,
+                                              Integer lsfxProjectId,
+                                              CcdiFileUploadRecord record,
+                                              Integer logId,
+                                              boolean preserveRecordFileName) {
        log.info("【文件上传】步骤3: 更新状态为解析中, logId={}", logId);
        record.setLogId(logId);
        record.setFileStatus("parsing");
@@ -736,11 +744,13 @@ public class CcdiFileUploadServiceImpl implements ICcdiFileUploadService {
        GetFileUploadStatusResponse.LogItem logItem = statusResponse.getData().getLogs().get(0);
        Integer status = logItem.getStatus();
        String uploadStatusDesc = logItem.getUploadStatusDesc();
-        String fileName = StringUtils.hasText(logItem.getUploadFileName())
-            ? logItem.getUploadFileName()
-            : logItem.getDownloadFileName();
-        if (StringUtils.hasText(fileName)) {
-            record.setFileName(fileName);
+        if (!preserveRecordFileName) {
+            String fileName = StringUtils.hasText(logItem.getUploadFileName())
+                ? logItem.getUploadFileName()
+                : logItem.getDownloadFileName();
+            if (StringUtils.hasText(fileName)) {
+                record.setFileName(fileName);
+            }
        }
        if (logItem.getFileSize() != null) {
            record.setFileSize(logItem.getFileSize());
--- a/ccdi-project/src/test/java/com/ruoyi/ccdi/project/service/impl/CcdiFileUploadServiceImplTest.java
+++ b/ccdi-project/src/test/java/com/ruoyi/ccdi/project/service/impl/CcdiFileUploadServiceImplTest.java
@@ -265,7 +265,8 @@ class CcdiFileUploadServiceImplTest {
        AtomicInteger sequence = new AtomicInteger();
        captureRecordStatus(events, sequence);

-        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any())).thenReturn(buildUploadResponse());
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), org.mockito.ArgumentMatchers.anyString()))
+            .thenReturn(buildUploadResponse());
        when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
            .thenReturn(buildCheckParseStatusResponse(false));
        when(lsfxClient.getFileUploadStatus(any())).thenReturn(buildParsedSuccessStatusResponse());
@@ -291,7 +292,8 @@ class CcdiFileUploadServiceImplTest {
        when(projectMapper.selectById(PROJECT_ID)).thenReturn(project);
        when(bankStatementMapper.countMatchedStaffCountByProjectId(PROJECT_ID)).thenReturn(1);

-        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any())).thenReturn(buildUploadResponse());
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), org.mockito.ArgumentMatchers.anyString()))
+            .thenReturn(buildUploadResponse());
        when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
            .thenReturn(buildCheckParseStatusResponse(false));
        when(lsfxClient.getFileUploadStatus(any())).thenReturn(buildParsedSuccessStatusResponse());
@@ -317,7 +319,8 @@ class CcdiFileUploadServiceImplTest {

    @Test
    void processFileAsync_shouldCleanupInsertedStatementsWhenFetchFails() throws IOException {
-        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any())).thenReturn(buildUploadResponse());
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), org.mockito.ArgumentMatchers.anyString()))
+            .thenReturn(buildUploadResponse());
        when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
            .thenReturn(buildCheckParseStatusResponse(false));
        when(lsfxClient.getFileUploadStatus(any())).thenReturn(buildParsedSuccessStatusResponse());
@@ -364,6 +367,77 @@ class CcdiFileUploadServiceImplTest {
        );
    }

+    @Test
+    void processFileAsync_shouldUploadToLsfxWithOriginalRecordFileName() throws IOException {
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), eq("原始流水.xlsx")))
+            .thenReturn(buildUploadResponse());
+        when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
+            .thenReturn(buildCheckParseStatusResponse(false));
+        when(lsfxClient.getFileUploadStatus(any())).thenReturn(buildParsedSuccessStatusResponse());
+        when(lsfxClient.getBankStatement(any(GetBankStatementRequest.class)))
+            .thenReturn(buildEmptyBankStatementResponse());
+
+        CcdiFileUploadRecord record = buildRecord();
+        record.setFileName("原始流水.xlsx");
+        Path tempFile = createTempFile();
+
+        service.processFileAsync(PROJECT_ID, LSFX_PROJECT_ID, tempFile.toString(), RECORD_ID, "batch-1", record);
+
+        verify(lsfxClient).uploadFile(eq(LSFX_PROJECT_ID), argThat(file ->
+            file.getName().startsWith("upload-") && file.getName().endsWith(".xlsx")
+        ), eq("原始流水.xlsx"));
+    }
+
+    @Test
+    void processFileAsync_shouldKeepOriginalFileNameWhenStatusReturnsDifferentName() throws IOException {
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), org.mockito.ArgumentMatchers.anyString()))
+            .thenReturn(buildUploadResponse());
+        when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
+            .thenReturn(buildCheckParseStatusResponse(false));
+        when(lsfxClient.getFileUploadStatus(any()))
+            .thenReturn(buildParsedSuccessStatusResponse("平台返回文件名.xlsx"));
+        when(lsfxClient.getBankStatement(any(GetBankStatementRequest.class)))
+            .thenReturn(buildEmptyBankStatementResponse());
+
+        CcdiFileUploadRecord record = buildRecord();
+        record.setFileName("原始流水.xlsx");
+        Path tempFile = createTempFile();
+
+        service.processFileAsync(PROJECT_ID, LSFX_PROJECT_ID, tempFile.toString(), RECORD_ID, "batch-1", record);
+
+        verify(recordMapper, org.mockito.Mockito.atLeastOnce()).updateById(
+            org.mockito.ArgumentMatchers.<CcdiFileUploadRecord>argThat(item ->
+                "parsed_success".equals(item.getFileStatus())
+                    && "原始流水.xlsx".equals(item.getFileName()))
+        );
+    }
+
+    @Test
+    void processFileAsync_shouldKeepOriginalFileNameWhenParseStatusFails() throws IOException {
+        GetFileUploadStatusResponse statusResponse = buildParsedSuccessStatusResponse("平台失败文件名.xlsx");
+        GetFileUploadStatusResponse.LogItem logItem = statusResponse.getData().getLogs().get(0);
+        logItem.setStatus(-1);
+        logItem.setUploadStatusDesc("parse.failed");
+
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), org.mockito.ArgumentMatchers.anyString()))
+            .thenReturn(buildUploadResponse());
+        when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
+            .thenReturn(buildCheckParseStatusResponse(false));
+        when(lsfxClient.getFileUploadStatus(any())).thenReturn(statusResponse);
+
+        CcdiFileUploadRecord record = buildRecord();
+        record.setFileName("原始流水.xlsx");
+        Path tempFile = createTempFile();
+
+        service.processFileAsync(PROJECT_ID, LSFX_PROJECT_ID, tempFile.toString(), RECORD_ID, "batch-1", record);
+
+        verify(recordMapper, org.mockito.Mockito.atLeastOnce()).updateById(
+            org.mockito.ArgumentMatchers.<CcdiFileUploadRecord>argThat(item ->
+                "parsed_failed".equals(item.getFileStatus())
+                    && "原始流水.xlsx".equals(item.getFileName()))
+        );
+    }
+
    @Test
    void deleteFileUploadRecord_shouldDeletePlatformFileBankStatementsAndMarkDeleted() {
        CcdiFileUploadRecord record = buildRecord();
@@ -468,7 +542,8 @@ class CcdiFileUploadServiceImplTest {
        AtomicInteger sequence = new AtomicInteger();
        captureRecordStatus(events, sequence);

-        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any())).thenReturn(buildUploadResponse());
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), org.mockito.ArgumentMatchers.anyString()))
+            .thenReturn(buildUploadResponse());
        when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
            .thenReturn(buildCheckParseStatusResponse(false));
        when(lsfxClient.getFileUploadStatus(any())).thenReturn(buildParsedSuccessStatusResponse());
@@ -491,7 +566,8 @@ class CcdiFileUploadServiceImplTest {
        List<CcdiFileUploadRecord> updates = new ArrayList<>();
        captureUpdatedRecords(updates);

-        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any())).thenReturn(buildUploadResponse());
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), org.mockito.ArgumentMatchers.anyString()))
+            .thenReturn(buildUploadResponse());
        when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
            .thenReturn(buildCheckParseStatusResponse(false));
        when(lsfxClient.getFileUploadStatus(any())).thenReturn(buildParsedSuccessStatusResponse());
@@ -512,7 +588,7 @@ class CcdiFileUploadServiceImplTest {
        List<CcdiFileUploadRecord> updates = new ArrayList<>();
        captureUpdatedRecords(updates);

-        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any()))
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), org.mockito.ArgumentMatchers.anyString()))
            .thenThrow(new RuntimeException("upload failed:" + "x".repeat(3000)));

        CcdiFileUploadRecord record = buildRecord();
@@ -526,7 +602,8 @@ class CcdiFileUploadServiceImplTest {

    @Test
    void fetchAndSaveBankStatements_shouldTrimLeAccountNoBeforeInsert() throws IOException {
-        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any())).thenReturn(buildUploadResponse());
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), org.mockito.ArgumentMatchers.anyString()))
+            .thenReturn(buildUploadResponse());
        when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
            .thenReturn(buildCheckParseStatusResponse(false));
        when(lsfxClient.getFileUploadStatus(any())).thenReturn(buildParsedSuccessStatusResponse());
@@ -597,7 +674,8 @@ class CcdiFileUploadServiceImplTest {
        AtomicInteger sequence = new AtomicInteger();
        captureRecordStatus(events, sequence);

-        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any())).thenReturn(buildUploadResponse());
+        when(lsfxClient.uploadFile(eq(LSFX_PROJECT_ID), any(), org.mockito.ArgumentMatchers.anyString()))
+            .thenReturn(buildUploadResponse());
        when(lsfxClient.checkParseStatus(LSFX_PROJECT_ID, String.valueOf(LOG_ID)))
            .thenReturn(buildCheckParseStatusResponse(false));
        when(lsfxClient.getFileUploadStatus(any())).thenReturn(buildParsedSuccessStatusResponse());