From 4a560bd4e40159b1a706968676692828ad241b81 Mon Sep 17 00:00:00 2001 From: wkc <978997012@qq.com> Date: Fri, 6 Feb 2026 16:11:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E4=BA=A4=E6=98=93=E5=AF=BC=E5=85=A5=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E4=B8=93=E9=97=A8=E7=9A=84=E5=A4=B1=E8=B4=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?VO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将通用的ImportFailureVO替换为专门的PurchaseTransactionImportFailureVO， 以提供更明确的类型安全和更好的API文档。 修改文件: - ICcdiPurchaseTransactionImportService.java: 更新接口方法返回类型 - CcdiPurchaseTransactionImportServiceImpl.java: 更新实现类使用专门的VO - CcdiPurchaseTransactionController.java: 更新Controller使用专门的VO Co-Authored-By: Claude Sonnet 4.5 --- .../controller/CcdiPurchaseTransactionController.java | 4 ++-- .../ICcdiPurchaseTransactionImportService.java | 4 ++-- .../CcdiPurchaseTransactionImportServiceImpl.java | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java index 96b1c78..2c44d57 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java +++ b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java @@ -6,7 +6,7 @@ import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionEditDTO; import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionQueryDTO; import com.ruoyi.ccdi.domain.excel.CcdiPurchaseTransactionExcel; import com.ruoyi.ccdi.domain.vo.CcdiPurchaseTransactionVO; -import com.ruoyi.ccdi.domain.vo.ImportFailureVO; +import com.ruoyi.ccdi.domain.vo.PurchaseTransactionImportFailureVO; import com.ruoyi.ccdi.domain.vo.ImportStatusVO; import com.ruoyi.ccdi.service.ICcdiPurchaseTransactionImportService; import com.ruoyi.ccdi.service.ICcdiPurchaseTransactionService; @@ -164,7 +164,7 @@ public class CcdiPurchaseTransactionController extends BaseController { @PreAuthorize("@ss.hasPermi('ccdi:purchaseTransaction:import')") @GetMapping("/importFailures/{taskId}") public AjaxResult getImportFailures(@PathVariable String taskId) { - List failures = transactionImportService.getImportFailures(taskId); + List failures = transactionImportService.getImportFailures(taskId); return success(failures); } } diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiPurchaseTransactionImportService.java b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiPurchaseTransactionImportService.java index f4ccdd0..2af4c1f 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiPurchaseTransactionImportService.java +++ b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiPurchaseTransactionImportService.java @@ -1,7 +1,7 @@ package com.ruoyi.ccdi.service; import com.ruoyi.ccdi.domain.excel.CcdiPurchaseTransactionExcel; -import com.ruoyi.ccdi.domain.vo.ImportFailureVO; +import com.ruoyi.ccdi.domain.vo.PurchaseTransactionImportFailureVO; import com.ruoyi.ccdi.domain.vo.ImportStatusVO; import java.util.List; @@ -38,5 +38,5 @@ public interface ICcdiPurchaseTransactionImportService { * @param taskId 任务ID * @return 失败记录列表 */ - List getImportFailures(String taskId); + List getImportFailures(String taskId); } diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java index 74b585a..b263404 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java +++ b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.ccdi.domain.CcdiPurchaseTransaction; import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionAddDTO; import com.ruoyi.ccdi.domain.excel.CcdiPurchaseTransactionExcel; -import com.ruoyi.ccdi.domain.vo.ImportFailureVO; +import com.ruoyi.ccdi.domain.vo.PurchaseTransactionImportFailureVO; import com.ruoyi.ccdi.domain.vo.ImportResult; import com.ruoyi.ccdi.domain.vo.ImportStatusVO; import com.ruoyi.ccdi.mapper.CcdiPurchaseTransactionMapper; @@ -46,7 +46,7 @@ public class CcdiPurchaseTransactionImportServiceImpl implements ICcdiPurchaseTr public void importTransactionAsync(List excelList, Boolean isUpdateSupport, String taskId, String userName) { List newRecords = new ArrayList<>(); List updateRecords = new ArrayList<>(); - List failures = new ArrayList<>(); + List failures = new ArrayList<>(); // 批量查询已存在的采购事项ID Set existingIds = getExistingPurchaseIds(excelList); @@ -75,11 +75,12 @@ public class CcdiPurchaseTransactionImportServiceImpl implements ICcdiPurchaseTr } } else { transaction.setCreatedBy(userName); + transaction.setUpdatedBy(userName); newRecords.add(transaction); } } catch (Exception e) { - ImportFailureVO failure = new ImportFailureVO(); + PurchaseTransactionImportFailureVO failure = new PurchaseTransactionImportFailureVO(); BeanUtils.copyProperties(excel, failure); failure.setErrorMessage(e.getMessage()); failures.add(failure); @@ -119,7 +120,7 @@ public class CcdiPurchaseTransactionImportServiceImpl implements ICcdiPurchaseTr * @return 失败记录列表 */ @Override - public List getImportFailures(String taskId) { + public List getImportFailures(String taskId) { String key = "import:purchaseTransaction:" + taskId + ":failures"; Object failuresObj = redisTemplate.opsForValue().get(key); @@ -127,7 +128,7 @@ public class CcdiPurchaseTransactionImportServiceImpl implements ICcdiPurchaseTr return Collections.emptyList(); } - return JSON.parseArray(JSON.toJSONString(failuresObj), ImportFailureVO.class); + return JSON.parseArray(JSON.toJSONString(failuresObj), PurchaseTransactionImportFailureVO.class); } /**