From bba31665aadea0bdf348a00f5f1761b7e7f040c0 Mon Sep 17 00:00:00 2001 From: zs <2862877643@qq.com> Date: Fri, 5 Jun 2026 23:02:35 +0800 Subject: [PATCH] =?UTF-8?q?fix(excel):=20=E7=BB=9F=E4=B8=80=20uploadExcelF?= =?UTF-8?q?ile=20=E6=96=B9=E6=B3=95=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/controller/ExcelFileController.java | 4 ++-- .../parser/biz/service/ExcelFileService.java | 4 ++-- .../biz/service/app/ExcelUploadAppService.java | 2 +- .../biz/service/impl/ExcelFileServiceImpl.java | 4 ++-- .../service/app/ExcelUploadAppServiceTest.java | 16 ++++++++-------- .../service/impl/ExcelFileServiceImplTest.java | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/controller/ExcelFileController.java b/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/controller/ExcelFileController.java index 8fceff9..9f8e711 100644 --- a/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/controller/ExcelFileController.java +++ b/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/controller/ExcelFileController.java @@ -24,9 +24,9 @@ public class ExcelFileController { */ @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) //@ApiOperationLog(description = "上传Excel文件") - public Response uploadAndParseExcel(@Validated ExcelFileUploadDTO excelFileUploadDTO/* 相应的请求参数类 */) { + public Response uploadExcelFile(@Validated ExcelFileUploadDTO excelFileUploadDTO/* 相应的请求参数类 */) { - return excelFileService.uploadAExcel(excelFileUploadDTO); + return excelFileService.uploadExcelFile(excelFileUploadDTO); } /** diff --git a/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/ExcelFileService.java b/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/ExcelFileService.java index bf7e349..df1d2a7 100644 --- a/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/ExcelFileService.java +++ b/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/ExcelFileService.java @@ -10,11 +10,11 @@ public interface ExcelFileService { * @param excelFileUploadDTO * @return */ - Response uploadAExcel(ExcelFileUploadDTO excelFileUploadDTO); + Response uploadExcelFile(ExcelFileUploadDTO excelFileUploadDTO); /** * 根据 preUploadId 查询校验失败明细。 - * 说明：preUploadId 仅在 uploadAExcel 校验失败时生成并返回。 + * 说明：preUploadId 仅在 uploadExcelFile 校验失败时生成并返回。 */ Response getValidationErrors(Long preUploadId); diff --git a/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/app/ExcelUploadAppService.java b/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/app/ExcelUploadAppService.java index 8d72ae9..0cf16fc 100644 --- a/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/app/ExcelUploadAppService.java +++ b/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/app/ExcelUploadAppService.java @@ -58,7 +58,7 @@ public class ExcelUploadAppService { @Resource private ExcelFileRecordSupport excelFileRecordSupport; - public Response uploadAExcel(ExcelFileUploadDTO excelFileUploadDTO) { + public Response uploadExcelFile(ExcelFileUploadDTO excelFileUploadDTO) { MultipartFile file = excelFileUploadDTO.getFile(); String originalFilename = file.getOriginalFilename(); diff --git a/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/impl/ExcelFileServiceImpl.java b/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/impl/ExcelFileServiceImpl.java index 25f2b34..b8c22d8 100644 --- a/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/impl/ExcelFileServiceImpl.java +++ b/eaqb-excel-parser/eaqb-excel-parser.biz/src/main/java/com/zhoushuo/eaqb/excel/parser/biz/service/impl/ExcelFileServiceImpl.java @@ -26,8 +26,8 @@ public class ExcelFileServiceImpl implements ExcelFileService { private ExcelParseAppService excelParseAppService; @Override - public Response uploadAExcel(ExcelFileUploadDTO excelFileUploadDTO) { - return excelUploadAppService.uploadAExcel(excelFileUploadDTO); + public Response uploadExcelFile(ExcelFileUploadDTO excelFileUploadDTO) { + return excelUploadAppService.uploadExcelFile(excelFileUploadDTO); } @Override diff --git a/eaqb-excel-parser/eaqb-excel-parser.biz/src/test/java/com/zhoushuo/eaqb/excel/parser/biz/service/app/ExcelUploadAppServiceTest.java b/eaqb-excel-parser/eaqb-excel-parser.biz/src/test/java/com/zhoushuo/eaqb/excel/parser/biz/service/app/ExcelUploadAppServiceTest.java index c57180b..ab8dad6 100644 --- a/eaqb-excel-parser/eaqb-excel-parser.biz/src/test/java/com/zhoushuo/eaqb/excel/parser/biz/service/app/ExcelUploadAppServiceTest.java +++ b/eaqb-excel-parser/eaqb-excel-parser.biz/src/test/java/com/zhoushuo/eaqb/excel/parser/biz/service/app/ExcelUploadAppServiceTest.java @@ -63,7 +63,7 @@ void tearDown() { } @Test - void uploadAExcel_validExcel_shouldReturnFileIdAndUploadedStatus() throws Exception { + void uploadExcelFile_validExcel_shouldReturnFileIdAndUploadedStatus() throws Exception { LoginUserContextHolder.setUserId(123L); when(distributedIdGeneratorRpcService.getFileId()).thenReturn("9001"); when(ossRpcService.uploadExcel(any(), eq("9001.xlsx"))).thenReturn("excel/123/9001.xlsx"); @@ -82,7 +82,7 @@ void uploadAExcel_validExcel_shouldReturnFileIdAndUploadedStatus() throws Except buildExcelBytes(List.of(List.of("题目一", "A", "解析一"))) )); - Response response = excelUploadAppService.uploadAExcel(dto); + Response response = excelUploadAppService.uploadExcelFile(dto); assertTrue(response.isSuccess()); ExcelFileUploadVO vo = (ExcelFileUploadVO) response.getData(); @@ -94,7 +94,7 @@ void uploadAExcel_validExcel_shouldReturnFileIdAndUploadedStatus() throws Except } @Test - void uploadAExcel_invalidExcel_shouldReturnPreUploadIdAndFailStatus() throws Exception { + void uploadExcelFile_invalidExcel_shouldReturnPreUploadIdAndFailStatus() throws Exception { LoginUserContextHolder.setUserId(123L); when(distributedIdGeneratorRpcService.getPreFileId()).thenReturn("7001"); @@ -112,7 +112,7 @@ void uploadAExcel_invalidExcel_shouldReturnPreUploadIdAndFailStatus() throws Exc buildExcelBytes(List.of(List.of("错 题", "A", "解析一"))) )); - Response response = excelUploadAppService.uploadAExcel(dto); + Response response = excelUploadAppService.uploadExcelFile(dto); assertTrue(response.isSuccess()); ExcelFileUploadVO vo = (ExcelFileUploadVO) response.getData(); @@ -123,7 +123,7 @@ void uploadAExcel_invalidExcel_shouldReturnPreUploadIdAndFailStatus() throws Exc } @Test - void uploadAExcel_whenHeaderIsNotOnFirstRow_shouldReturnValidationFailure() throws Exception { + void uploadExcelFile_whenHeaderIsNotOnFirstRow_shouldReturnValidationFailure() throws Exception { LoginUserContextHolder.setUserId(123L); when(distributedIdGeneratorRpcService.getPreFileId()).thenReturn("7002"); @@ -145,7 +145,7 @@ void uploadAExcel_whenHeaderIsNotOnFirstRow_shouldReturnValidationFailure() thro )) )); - Response response = excelUploadAppService.uploadAExcel(dto); + Response response = excelUploadAppService.uploadExcelFile(dto); assertTrue(response.isSuccess()); ExcelFileUploadVO vo = (ExcelFileUploadVO) response.getData(); @@ -156,7 +156,7 @@ void uploadAExcel_whenHeaderIsNotOnFirstRow_shouldReturnValidationFailure() thro } @Test - void uploadAExcel_whenOssUploadFails_shouldMarkUploadFailedAndPropagateOriginalBizException() throws Exception { + void uploadExcelFile_whenOssUploadFails_shouldMarkUploadFailedAndPropagateOriginalBizException() throws Exception { LoginUserContextHolder.setUserId(123L); when(distributedIdGeneratorRpcService.getFileId()).thenReturn("9002"); when(ossRpcService.uploadExcel(any(), eq("9002.xlsx"))) @@ -170,7 +170,7 @@ void uploadAExcel_whenOssUploadFails_shouldMarkUploadFailedAndPropagateOriginalB buildExcelBytes(List.of(List.of("题目一", "A", "解析一"))) )); - BizException ex = assertThrows(BizException.class, () -> excelUploadAppService.uploadAExcel(dto)); + BizException ex = assertThrows(BizException.class, () -> excelUploadAppService.uploadExcelFile(dto)); assertEquals("OSS-2", ex.getErrorCode()); assertEquals("upload failed", ex.getErrorMessage()); diff --git a/eaqb-excel-parser/eaqb-excel-parser.biz/src/test/java/com/zhoushuo/eaqb/excel/parser/biz/service/impl/ExcelFileServiceImplTest.java b/eaqb-excel-parser/eaqb-excel-parser.biz/src/test/java/com/zhoushuo/eaqb/excel/parser/biz/service/impl/ExcelFileServiceImplTest.java index b2c2dc6..8776382 100644 --- a/eaqb-excel-parser/eaqb-excel-parser.biz/src/test/java/com/zhoushuo/eaqb/excel/parser/biz/service/impl/ExcelFileServiceImplTest.java +++ b/eaqb-excel-parser/eaqb-excel-parser.biz/src/test/java/com/zhoushuo/eaqb/excel/parser/biz/service/impl/ExcelFileServiceImplTest.java @@ -38,15 +38,15 @@ class ExcelFileServiceImplTest { private ExcelFileServiceImpl excelFileService; @Test - void uploadAExcel_shouldDelegateToUploadAppService() { + void uploadExcelFile_shouldDelegateToUploadAppService() { ExcelFileUploadDTO dto = new ExcelFileUploadDTO(); Response expected = Response.success("upload-ok"); - doReturn(expected).when(excelUploadAppService).uploadAExcel(dto); + doReturn(expected).when(excelUploadAppService).uploadExcelFile(dto); - Response actual = excelFileService.uploadAExcel(dto); + Response actual = excelFileService.uploadExcelFile(dto); assertSame(expected, actual); - verify(excelUploadAppService).uploadAExcel(dto); + verify(excelUploadAppService).uploadExcelFile(dto); } @Test