From a3fda60ae3c095f3aae1b7fe556148a4e065c53c5ec09a9db0b6691fd27b9a33 Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Wed, 26 Nov 2025 11:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E4=B8=8A=E6=8A=A5=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=B7=A1=E6=A3=80=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EbikeFaultFileServiceImpl.java       | 13 +++---
 .../impl/EbikeFaultReportServiceImpl.java     | 42 +++++++++++--------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultFileServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultFileServiceImpl.java
index 2a1a6eb..dc104cd 100644
--- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultFileServiceImpl.java
+++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultFileServiceImpl.java
@@ -10,7 +10,8 @@ import org.springframework.stereotype.Service;
 import java.util.Collections;
 import java.util.List;
 
-import static com.cdzy.user.model.entity.table.EbikeAttachmentFileTableDef.EBIKE_ATTACHMENT_FILE;
+import static com.cdzy.user.model.entity.table.EbikeFaultFileTableDef.EBIKE_FAULT_FILE;
+
 
 /**
  * 用车相关附件文件记录 服务实现类
@@ -24,16 +25,16 @@ public class EbikeFaultFileServiceImpl extends ServiceImpl<EbikeFaultFileMapper,
     @Override
     public List<EbikeFaultFile> queryFiles(Long reportId) {
         QueryWrapper query = QueryWrapper.create()
-                .select(EBIKE_ATTACHMENT_FILE.ALL_COLUMNS)
-                .where(EBIKE_ATTACHMENT_FILE.REPORT_ID.eq(reportId));
+                .select(EBIKE_FAULT_FILE.ALL_COLUMNS)
+                .where(EBIKE_FAULT_FILE.REPORT_ID.eq(reportId));
         return this.mapper.selectListByQuery(query);
     }
 
     @Override
     public void deleteFileByReportId(Long reportId) {
         QueryWrapper query = QueryWrapper.create()
-                .select(EBIKE_ATTACHMENT_FILE.ALL_COLUMNS)
-                .where(EBIKE_ATTACHMENT_FILE.REPORT_ID.eq(reportId));
+                .select(EBIKE_FAULT_FILE.ALL_COLUMNS)
+                .where(EBIKE_FAULT_FILE.REPORT_ID.eq(reportId));
         this.mapper.deleteByQuery(query);
     }
 
@@ -43,7 +44,7 @@ public class EbikeFaultFileServiceImpl extends ServiceImpl<EbikeFaultFileMapper,
             return Collections.emptyList();
         }
         QueryWrapper query = QueryWrapper.create()
-                .and(EBIKE_ATTACHMENT_FILE.REPORT_ID.in(reportIds));
+                .and(EBIKE_FAULT_FILE.REPORT_ID.in(reportIds));
         return this.list(query);
     }
 }
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 49a48f9..c934412 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
@@ -38,7 +38,7 @@ import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.cdzy.user.model.entity.table.EbikeAttachmentFileTableDef.EBIKE_ATTACHMENT_FILE;
+import static com.cdzy.user.model.entity.table.EbikeFaultFileTableDef.EBIKE_FAULT_FILE;
 import static com.cdzy.user.model.entity.table.EbikeFaultPartTableDef.EBIKE_FAULT_PART;
 import static com.cdzy.user.model.entity.table.EbikeFaultReportTableDef.EBIKE_FAULT_REPORT;
 import static com.cdzy.user.model.entity.table.EbikeUserTableDef.EBIKE_USER;
@@ -96,23 +96,28 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                     .collect(Collectors.toList());
             ebikeAttachmentFileService.saveBatch(fileEntities);
         }
-        // 保存故障上报部位
-        List<Integer> faultPart = ebikeFaultReportDto.getFaultPart();
-        List<EbikeFaultPart> fileEntities = faultPart.stream().map(e -> EbikeFaultPart.builder()
-                        .reportId(reportId)
-                        .faultPart(e)
-                        .createBy(ebikeFaultReportDto.getUserId())
-                        .build())
-                .toList();
-        ebikeFaultPartService.saveBatch(fileEntities);
-        // 根据bikeCode生成巡检工单
-        List<String> fileUrls = null;
-        if (Objects.nonNull(attachmentFiles)) {
-             fileUrls = attachmentFiles.stream()
-                    .map(EbikeFaultFileDto::getFileUrl)
-                    .filter(Objects::nonNull)
+
+        List<Integer> faultPart = Optional.ofNullable(ebikeFaultReportDto.getFaultPart())
+                .orElse(Collections.emptyList());
+
+        if (!faultPart.isEmpty()) {
+            List<EbikeFaultPart> partEntities = faultPart.stream()
+                    .map(part -> EbikeFaultPart.builder()
+                            .reportId(reportId)
+                            .faultPart(part)
+                            .createBy(ebikeFaultReportDto.getUserId())
+                            .build())
                     .toList();
+            ebikeFaultPartService.saveBatch(partEntities);
         }
+        // 获取附件 URL 列表
+        List<String> fileUrls = Optional.ofNullable(ebikeFaultReportDto.getAttachmentFiles())
+                .orElse(Collections.emptyList())
+                .stream()
+                .map(EbikeFaultFileDto::getFileUrl)
+                .filter(Objects::nonNull)
+                .toList();
+        // 生成巡检工单
         FeignInspectionSwapOrderVo feignInspectionSwapOrderVo = FeignInspectionSwapOrderVo.builder()
                 .bikeCode(ebikeFaultReportDto.getBikeCode())
                 .parts(faultPart)
@@ -122,6 +127,7 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
         if (jsonResult.getCode() != Code.SUCCESS) {
             throw new EbikeException("故障上报生成巡检工单失败!");
         }
+
         return reportId;
     }
 
@@ -389,8 +395,8 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
 
         // 获取上传图片 按照reportId分组
         QueryWrapper attachmentQuery = QueryWrapper.create()
-                .select(EBIKE_ATTACHMENT_FILE.ALL_COLUMNS)
-                .where(EBIKE_ATTACHMENT_FILE.REPORT_ID.in(reportIds));
+                .select(EBIKE_FAULT_FILE.ALL_COLUMNS)
+                .where(EBIKE_FAULT_FILE.REPORT_ID.in(reportIds));
         List<EbikeFaultFile> allAttachments = ebikeAttachmentFileService.list(attachmentQuery);
         Map<Long, List<EbikeFaultFile>> attachmentsByReportId = allAttachments.stream()
                 .collect(Collectors.groupingBy(EbikeFaultFile::getReportId));