From b7118a50b2eed00d2ebbf5dbd929698b0a6bb3f5ee192cad3410dfd54bb90984 Mon Sep 17 00:00:00 2001 From: yanglei Date: Wed, 26 Nov 2025 10:27:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=85=E9=9A=9C=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E6=96=87=E4=BB=B6=E8=A1=A8=E5=90=8D=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EbikeFaultReportController.java | 4 +- .../controller/EbikeRefundController.java | 2 +- .../user/enums/EbikeFaultReportStatus.java | 26 ++++++++ .../user/enums/EbikeRegionInOperation.java | 13 ---- ...eMapper.java => EbikeFaultFileMapper.java} | 4 +- ...entFileDto.java => EbikeFaultFileDto.java} | 2 +- .../user/model/dto/EbikeFaultReportDto.java | 2 +- ...ttachmentFile.java => EbikeFaultFile.java} | 4 +- ...hmentFileVo.java => EbikeFaultFileVo.java} | 2 +- .../user/model/vo/EbikeFaultReportVo.java | 4 +- ...ervice.java => EbikeFaultFileService.java} | 8 +-- .../user/service/EbikeFaultReportService.java | 4 +- .../cdzy/user/service/EbikeRefundService.java | 4 +- ...pl.java => EbikeFaultFileServiceImpl.java} | 12 ++-- .../impl/EbikeFaultReportServiceImpl.java | 62 ++++++++++--------- .../service/impl/EbikeRefundServiceImpl.java | 4 +- ebike-user/src/main/resources/db/init.sql | 36 +++++------ 17 files changed, 102 insertions(+), 91 deletions(-) create mode 100644 ebike-user/src/main/java/com/cdzy/user/enums/EbikeFaultReportStatus.java delete mode 100644 ebike-user/src/main/java/com/cdzy/user/enums/EbikeRegionInOperation.java rename ebike-user/src/main/java/com/cdzy/user/mapper/{EbikeAttachmentFileMapper.java => EbikeFaultFileMapper.java} (55%) rename ebike-user/src/main/java/com/cdzy/user/model/dto/{EbikeAttachmentFileDto.java => EbikeFaultFileDto.java} (93%) rename ebike-user/src/main/java/com/cdzy/user/model/entity/{EbikeAttachmentFile.java => EbikeFaultFile.java} (93%) rename ebike-user/src/main/java/com/cdzy/user/model/vo/{EbikeAttachmentFileVo.java => EbikeFaultFileVo.java} (90%) rename ebike-user/src/main/java/com/cdzy/user/service/{EbikeAttachmentFileService.java => EbikeFaultFileService.java} (68%) rename ebike-user/src/main/java/com/cdzy/user/service/impl/{EbikeAttachmentFileServiceImpl.java => EbikeFaultFileServiceImpl.java} (73%) diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeFaultReportController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeFaultReportController.java index 993cf87..dc8e4c8 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeFaultReportController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeFaultReportController.java @@ -6,7 +6,7 @@ import com.cdzy.user.model.dto.EbikeFaultReportDto; import com.cdzy.user.model.dto.EbikeFaultReportQueryDto; import com.cdzy.user.model.dto.EbikeOrderFaultReportDto; import com.cdzy.user.model.entity.EbikeFaultReport; -import com.cdzy.user.model.vo.EbikeAttachmentFileVo; +import com.cdzy.user.model.vo.EbikeFaultFileVo; import com.cdzy.user.model.vo.EbikeFaultReportVo; import com.cdzy.user.model.vo.EbikeOrderFaultReportVo; import com.cdzy.user.service.EbikeFaultReportService; @@ -42,7 +42,7 @@ public class EbikeFaultReportController { */ @PostMapping("uploadFile") public JsonResult uploadFile(@RequestParam("multipartFile") MultipartFile multipartFile) { - EbikeAttachmentFileVo ebikeAttachmentFileVo = ebikeFaultReportService.uploadFile(multipartFile); + EbikeFaultFileVo ebikeAttachmentFileVo = ebikeFaultReportService.uploadFile(multipartFile); return JsonResult.success(ebikeAttachmentFileVo); } diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeRefundController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeRefundController.java index 00e1972..f954e8d 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeRefundController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeRefundController.java @@ -129,7 +129,7 @@ public class EbikeRefundController { */ @PostMapping("uploadFile") public JsonResult uploadFile(@RequestParam("multipartFile") MultipartFile multipartFile) { - EbikeAttachmentFileVo ebikeAttachmentFileVo = ebikeRefundService.uploadFile(multipartFile); + EbikeFaultFileVo ebikeAttachmentFileVo = ebikeRefundService.uploadFile(multipartFile); return JsonResult.success(ebikeAttachmentFileVo); } diff --git a/ebike-user/src/main/java/com/cdzy/user/enums/EbikeFaultReportStatus.java b/ebike-user/src/main/java/com/cdzy/user/enums/EbikeFaultReportStatus.java new file mode 100644 index 0000000..fe758eb --- /dev/null +++ b/ebike-user/src/main/java/com/cdzy/user/enums/EbikeFaultReportStatus.java @@ -0,0 +1,26 @@ +package com.cdzy.user.enums; + +/** + * 用户故障上报处理状态 + * + * @author yanglei + * @since 2025-11-26 10:23 + */ + +public interface EbikeFaultReportStatus { + + /** + * 待处理 + */ + int PENDING = 0; + + /** + * 处理中 + */ + int PROCESSING = 1; + + /** + * 处理完成 + */ + int PROCESS_COMPLETED = 2; +} diff --git a/ebike-user/src/main/java/com/cdzy/user/enums/EbikeRegionInOperation.java b/ebike-user/src/main/java/com/cdzy/user/enums/EbikeRegionInOperation.java deleted file mode 100644 index dd4b8f2..0000000 --- a/ebike-user/src/main/java/com/cdzy/user/enums/EbikeRegionInOperation.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cdzy.user.enums; - -/** - * @author yanglei - * @since 2025-10-27 17:03 - */ - -public interface EbikeRegionInOperation { - - String IN = "1"; - - String OUT = "0"; -} diff --git a/ebike-user/src/main/java/com/cdzy/user/mapper/EbikeAttachmentFileMapper.java b/ebike-user/src/main/java/com/cdzy/user/mapper/EbikeFaultFileMapper.java similarity index 55% rename from ebike-user/src/main/java/com/cdzy/user/mapper/EbikeAttachmentFileMapper.java rename to ebike-user/src/main/java/com/cdzy/user/mapper/EbikeFaultFileMapper.java index 90922e3..74b75aa 100644 --- a/ebike-user/src/main/java/com/cdzy/user/mapper/EbikeAttachmentFileMapper.java +++ b/ebike-user/src/main/java/com/cdzy/user/mapper/EbikeFaultFileMapper.java @@ -1,6 +1,6 @@ package com.cdzy.user.mapper; -import com.cdzy.user.model.entity.EbikeAttachmentFile; +import com.cdzy.user.model.entity.EbikeFaultFile; import com.mybatisflex.core.BaseMapper; /** @@ -10,5 +10,5 @@ import com.mybatisflex.core.BaseMapper; * @since 2025-11-03 15:04 */ -public interface EbikeAttachmentFileMapper extends BaseMapper { +public interface EbikeFaultFileMapper extends BaseMapper { } diff --git a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeAttachmentFileDto.java b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultFileDto.java similarity index 93% rename from ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeAttachmentFileDto.java rename to ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultFileDto.java index 210c66d..4c6a67b 100644 --- a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeAttachmentFileDto.java +++ b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultFileDto.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class EbikeAttachmentFileDto { +public class EbikeFaultFileDto { /** * 文件主键id diff --git a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java index a413c26..b4bb9a0 100644 --- a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java +++ b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java @@ -86,5 +86,5 @@ public class EbikeFaultReportDto { /** * 附件文件列表 */ - List attachmentFiles; + List attachmentFiles; } diff --git a/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeAttachmentFile.java b/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeFaultFile.java similarity index 93% rename from ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeAttachmentFile.java rename to ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeFaultFile.java index e848079..4e72580 100644 --- a/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeAttachmentFile.java +++ b/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeFaultFile.java @@ -23,8 +23,8 @@ import java.time.LocalDateTime; @Builder @NoArgsConstructor @AllArgsConstructor -@Table("ebike_attachment_file") -public class EbikeAttachmentFile implements Serializable { +@Table("ebike_fault_file") +public class EbikeFaultFile implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeAttachmentFileVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultFileVo.java similarity index 90% rename from ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeAttachmentFileVo.java rename to ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultFileVo.java index fbab68c..51bfdab 100644 --- a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeAttachmentFileVo.java +++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultFileVo.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Builder @NoArgsConstructor @AllArgsConstructor -public class EbikeAttachmentFileVo implements Serializable { +public class EbikeFaultFileVo implements Serializable { /** * 文件名称 diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultReportVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultReportVo.java index 3e02e03..13ed570 100644 --- a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultReportVo.java +++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeFaultReportVo.java @@ -3,7 +3,7 @@ package com.cdzy.user.model.vo; import com.cdzy.user.handler.PGpointDeserializer; import com.cdzy.user.handler.PGpointSerializer; import com.cdzy.user.handler.PGpointTypeHandler; -import com.cdzy.user.model.dto.EbikeAttachmentFileDto; +import com.cdzy.user.model.dto.EbikeFaultFileDto; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.mybatisflex.annotation.Column; @@ -83,5 +83,5 @@ public class EbikeFaultReportVo { /** * 文件 */ - private List attachmentFiles; + private List attachmentFiles; } diff --git a/ebike-user/src/main/java/com/cdzy/user/service/EbikeAttachmentFileService.java b/ebike-user/src/main/java/com/cdzy/user/service/EbikeFaultFileService.java similarity index 68% rename from ebike-user/src/main/java/com/cdzy/user/service/EbikeAttachmentFileService.java rename to ebike-user/src/main/java/com/cdzy/user/service/EbikeFaultFileService.java index 6958292..6974c94 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/EbikeAttachmentFileService.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/EbikeFaultFileService.java @@ -1,6 +1,6 @@ package com.cdzy.user.service; -import com.cdzy.user.model.entity.EbikeAttachmentFile; +import com.cdzy.user.model.entity.EbikeFaultFile; import com.mybatisflex.core.service.IService; import java.util.List; @@ -12,7 +12,7 @@ import java.util.List; * @since 2025-11-03 15:06 */ -public interface EbikeAttachmentFileService extends IService { +public interface EbikeFaultFileService extends IService { /** * 根据故障上报主键id获取所有文件 @@ -20,7 +20,7 @@ public interface EbikeAttachmentFileService extends IService queryFiles(Long reportId); + List queryFiles(Long reportId); /** * 根据故障上报主键id删除所有文件 @@ -34,5 +34,5 @@ public interface EbikeAttachmentFileService extends IService queryFilesByReportIds(List reportIds); + List queryFilesByReportIds(List reportIds); } diff --git a/ebike-user/src/main/java/com/cdzy/user/service/EbikeFaultReportService.java b/ebike-user/src/main/java/com/cdzy/user/service/EbikeFaultReportService.java index 29845e4..9c926e5 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/EbikeFaultReportService.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/EbikeFaultReportService.java @@ -4,7 +4,7 @@ import com.cdzy.user.model.dto.EbikeFaultReportDto; import com.cdzy.user.model.dto.EbikeFaultReportQueryDto; import com.cdzy.user.model.dto.EbikeOrderFaultReportDto; import com.cdzy.user.model.entity.EbikeFaultReport; -import com.cdzy.user.model.vo.EbikeAttachmentFileVo; +import com.cdzy.user.model.vo.EbikeFaultFileVo; import com.cdzy.user.model.vo.EbikeFaultReportVo; import com.cdzy.user.model.vo.EbikeOrderFaultReportVo; import com.mybatisflex.core.paginate.Page; @@ -35,7 +35,7 @@ public interface EbikeFaultReportService extends IService { * @param multipartFile 文件 * @return 上传文件信息 */ - EbikeAttachmentFileVo uploadFile(MultipartFile multipartFile); + EbikeFaultFileVo uploadFile(MultipartFile multipartFile); /** * 根据文件名称删除minio中的文件 diff --git a/ebike-user/src/main/java/com/cdzy/user/service/EbikeRefundService.java b/ebike-user/src/main/java/com/cdzy/user/service/EbikeRefundService.java index e50c059..63c9dc3 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/EbikeRefundService.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/EbikeRefundService.java @@ -11,8 +11,6 @@ import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import org.springframework.web.multipart.MultipartFile; -import java.util.List; - /** * 用户退款 服务层 * @@ -93,7 +91,7 @@ public interface EbikeRefundService extends IService { * @param multipartFile 文件 * @return 文件信息 */ - EbikeAttachmentFileVo uploadFile(MultipartFile multipartFile); + EbikeFaultFileVo uploadFile(MultipartFile multipartFile); /** * 根据文件名称删除minio中的文件 diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeAttachmentFileServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultFileServiceImpl.java similarity index 73% rename from ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeAttachmentFileServiceImpl.java rename to ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultFileServiceImpl.java index 83885d5..2a1a6eb 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeAttachmentFileServiceImpl.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultFileServiceImpl.java @@ -1,8 +1,8 @@ package com.cdzy.user.service.impl; -import com.cdzy.user.mapper.EbikeAttachmentFileMapper; -import com.cdzy.user.model.entity.EbikeAttachmentFile; -import com.cdzy.user.service.EbikeAttachmentFileService; +import com.cdzy.user.mapper.EbikeFaultFileMapper; +import com.cdzy.user.model.entity.EbikeFaultFile; +import com.cdzy.user.service.EbikeFaultFileService; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -19,10 +19,10 @@ import static com.cdzy.user.model.entity.table.EbikeAttachmentFileTableDef.EBIKE * @since 2025-11-03 15:06 */ @Service -public class EbikeAttachmentFileServiceImpl extends ServiceImpl implements EbikeAttachmentFileService { +public class EbikeFaultFileServiceImpl extends ServiceImpl implements EbikeFaultFileService { @Override - public List queryFiles(Long reportId) { + public List queryFiles(Long reportId) { QueryWrapper query = QueryWrapper.create() .select(EBIKE_ATTACHMENT_FILE.ALL_COLUMNS) .where(EBIKE_ATTACHMENT_FILE.REPORT_ID.eq(reportId)); @@ -38,7 +38,7 @@ public class EbikeAttachmentFileServiceImpl extends ServiceImpl queryFilesByReportIds(List reportIds) { + public List queryFilesByReportIds(List reportIds) { if (reportIds == null || reportIds.isEmpty()) { return Collections.emptyList(); } diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java index f6cfcd5..2f34988 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java @@ -3,19 +3,20 @@ package com.cdzy.user.service.impl; import com.cdzy.common.enums.Code; import com.cdzy.common.ex.EbikeException; import com.cdzy.common.model.response.JsonResult; +import com.cdzy.user.enums.EbikeFaultReportStatus; import com.cdzy.user.enums.EbikeFileTypeEnum; import com.cdzy.user.mapper.EbikeFaultReportMapper; -import com.cdzy.user.model.dto.EbikeAttachmentFileDto; +import com.cdzy.user.model.dto.EbikeFaultFileDto; import com.cdzy.user.model.dto.EbikeFaultReportDto; import com.cdzy.user.model.dto.EbikeFaultReportQueryDto; import com.cdzy.user.model.dto.EbikeOrderFaultReportDto; -import com.cdzy.user.model.entity.EbikeAttachmentFile; +import com.cdzy.user.model.entity.EbikeFaultFile; import com.cdzy.user.model.entity.EbikeFaultPart; import com.cdzy.user.model.entity.EbikeFaultReport; -import com.cdzy.user.model.vo.EbikeAttachmentFileVo; +import com.cdzy.user.model.vo.EbikeFaultFileVo; import com.cdzy.user.model.vo.EbikeFaultReportVo; import com.cdzy.user.model.vo.EbikeOrderFaultReportVo; -import com.cdzy.user.service.EbikeAttachmentFileService; +import com.cdzy.user.service.EbikeFaultFileService; import com.cdzy.user.service.EbikeFaultPartService; import com.cdzy.user.service.EbikeFaultReportService; import com.cdzy.user.utils.MinioUtil; @@ -51,7 +52,7 @@ import static com.cdzy.user.model.entity.table.EbikeUserTableDef.EBIKE_USER; public class EbikeFaultReportServiceImpl extends ServiceImpl implements EbikeFaultReportService { @Resource - private EbikeAttachmentFileService ebikeAttachmentFileService; + private EbikeFaultFileService ebikeAttachmentFileService; @Resource private OperationsFeignClient operationsFeignClient; @@ -74,6 +75,7 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl attachmentFiles = ebikeFaultReportDto.getAttachmentFiles(); + List attachmentFiles = ebikeFaultReportDto.getAttachmentFiles(); if (attachmentFiles != null && !attachmentFiles.isEmpty()) { - List fileEntities = attachmentFiles.stream() - .map(dto -> EbikeAttachmentFile.builder() + List fileEntities = attachmentFiles.stream() + .map(dto -> EbikeFaultFile.builder() .reportId(reportId) .fileName(dto.getFileName()) .fileType(dto.getFileType()) @@ -108,7 +110,7 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl files = ebikeAttachmentFileService.queryFiles(reportId); + List files = ebikeAttachmentFileService.queryFiles(reportId); if (!CollectionUtils.isEmpty(files)) { - for (EbikeAttachmentFile file : files) { + for (EbikeFaultFile file : files) { minioUtil.deleteObject(file.getFileName()); } } @@ -182,26 +184,26 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl attachmentFiles = ebikeFaultReportDto.getAttachmentFiles(); + List attachmentFiles = ebikeFaultReportDto.getAttachmentFiles(); // 更新文件信息 if (!CollectionUtils.isEmpty(attachmentFiles)) { - List existingFiles = ebikeAttachmentFileService.queryFiles(ebikeFaultReportDto.getReportId()); + List existingFiles = ebikeAttachmentFileService.queryFiles(ebikeFaultReportDto.getReportId()); Set existingFileIds = existingFiles.stream() - .map(EbikeAttachmentFile::getFileId) + .map(EbikeFaultFile::getFileId) .filter(Objects::nonNull) .collect(Collectors.toSet()); // 分离前端数据,无id的新增,有id的对比 Set incomingFileIds = new HashSet<>(); - List filesToInsert = new ArrayList<>(); + List filesToInsert = new ArrayList<>(); - for (EbikeAttachmentFileDto dto : attachmentFiles) { + for (EbikeFaultFileDto dto : attachmentFiles) { if (dto.getFileId() != null) { incomingFileIds.add(dto.getFileId()); } else { // fileId 为空,则是新文件，插入数据 - EbikeAttachmentFile newFile = EbikeAttachmentFile.builder() + EbikeFaultFile newFile = EbikeFaultFile.builder() .reportId(ebikeFaultReportDto.getReportId()) .fileName(dto.getFileName()) .fileType(dto.getFileType()) @@ -262,10 +264,10 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl attachmentFiles = ebikeAttachmentFileService.queryFiles(reportId); + List attachmentFiles = ebikeAttachmentFileService.queryFiles(reportId); - List fileInfo = attachmentFiles.stream() - .map(file -> EbikeAttachmentFileDto.builder() + List fileInfo = attachmentFiles.stream() + .map(file -> EbikeFaultFileDto.builder() .fileId(file.getFileId()) .fileName(file.getFileName()) .fileType(file.getFileType()) @@ -308,10 +310,10 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl> fileMap = ebikeAttachmentFileService + Map> fileMap = ebikeAttachmentFileService .queryFilesByReportIds(reportIds) .stream() - .collect(Collectors.groupingBy(EbikeAttachmentFile::getReportId)); + .collect(Collectors.groupingBy(EbikeFaultFile::getReportId)); // 查询故障部件 List faultParts = ebikeFaultPartService.list( @@ -325,10 +327,10 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl { - List fileDtos = Optional.ofNullable(fileMap.get(report.getReportId())) + List fileDtos = Optional.ofNullable(fileMap.get(report.getReportId())) .orElse(Collections.emptyList()) .stream() - .map(file -> EbikeAttachmentFileDto.builder() + .map(file -> EbikeFaultFileDto.builder() .fileId(file.getFileId()) .fileName(file.getFileName()) .fileType(file.getFileType()) @@ -382,9 +384,9 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl allAttachments = ebikeAttachmentFileService.list(attachmentQuery); - Map> attachmentsByReportId = allAttachments.stream() - .collect(Collectors.groupingBy(EbikeAttachmentFile::getReportId)); + List allAttachments = ebikeAttachmentFileService.list(attachmentQuery); + Map> attachmentsByReportId = allAttachments.stream() + .collect(Collectors.groupingBy(EbikeFaultFile::getReportId)); // 获取部件 按照reportId分组 List faultPart = ebikeFaultPartService.getFaultPart(reportIds); @@ -395,10 +397,10 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl files = attachmentsByReportId.get(record.getReportId()); + List files = attachmentsByReportId.get(record.getReportId()); List fileUrls = new ArrayList<>(); if (files != null) { - for (EbikeAttachmentFile file : files) { + for (EbikeFaultFile file : files) { try { String url = minioUtil.getFileUrl(file.getFileName()); fileUrls.add(url); diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java index d7374a7..37e5a4b 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java @@ -391,7 +391,7 @@ public class EbikeRefundServiceImpl extends ServiceImpl