运维模块修改审核通过→提交故障上报→用户上报状态回写（已经审核过了）

ebike-common/src/main/java/com/cdzy/common/model/EbikeOrderAttachmentFileDto.java

@@ -51,7 +51,7 @@ public class EbikeOrderAttachmentFileDto implements Serializable {
     /**
      * 附件下载地址
      */
-    private String fileUrl;
+    private String url;
 
     /**
      * 数据桶名

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeBikeFaultHandleFile.java

@@ -79,4 +79,9 @@ public class EbikeBikeFaultHandleFile implements Serializable {
      * 删除时间
      */
     private LocalDateTime deletedAt;
+
+    /**
+     * 数据桶名
+     */
+    private String fileBucket;
 }

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java

@@ -432,15 +432,16 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             query.clear();
             query.eq(EBIKE_BIKE_FAULT_REPORT_FILE.REPORT_ID.getName(), ebikeBikeFaultReport.getFaultReportId());
             List<EbikeBikeFaultReportFile> ebikeBikeFaultReportFiles = ebikeBikeFaultReportFileMapper.selectListByQuery(query);
-            ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto();
             for (EbikeBikeFaultReportFile ebikeBikeFaultReportFile : ebikeBikeFaultReportFiles) {
+                ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto();
                 BeanUtils.copyProperties(ebikeBikeFaultReportFile, resEbikeFaultReportFileDto);
-                try {
+                //try {
-                    String faultReportBucket = minioUtil.getFileUrl("fault-report-bucket", ebikeBikeFaultReportFile.getFileUniqueKey());
+                    String bucket = ebikeBikeFaultReportFile.getFileBucket();
+                    String faultReportBucket = minioUtil.getFileUrl2(bucket==null||bucket.isEmpty()? "fault-report-bucket": bucket, ebikeBikeFaultReportFile.getFileUniqueKey());
                     resEbikeFaultReportFileDto.setUrl(faultReportBucket);
-                } catch (Exception e) {
+                //} catch (Exception e) {
-                    throw new RuntimeException(e);
+                //    throw new RuntimeException(e);
-                }
+                //}
                 fileList.add(resEbikeFaultReportFileDto);
             }
         }
@@ -1013,7 +1014,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                 ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto();
                 BeanUtils.copyProperties(ebikeBikeFaultReport, resEbikeFaultReportFileDto);
                 try {
-                    String faultReportBucket = minioUtil.getFileUrl("fault-report-bucket", ebikeBikeFaultReportFile.getFileUniqueKey());
+                    String bucket = ebikeBikeFaultReportFile.getFileBucket();
+                    String faultReportBucket = minioUtil.getFileUrl(bucket==null||bucket.isEmpty()?"fault-report-bucket" : bucket, ebikeBikeFaultReportFile.getFileUniqueKey());
                     resEbikeFaultReportFileDto.setUrl(faultReportBucket);
                 } catch (Exception e) {
                     throw new RuntimeException(e);
@@ -1028,7 +1030,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ResEbikeFaultHandleFileDto resEbikeFaultHandleFileDto = new ResEbikeFaultHandleFileDto();
             BeanUtils.copyProperties(ebikeBikeFaultHandleFile, resEbikeFaultHandleFileDto);
             try {
-                String faultReportBucket = minioUtil.getFileUrl("fault-report-bucket", ebikeBikeFaultHandleFile.getFileUniqueKey());
+                String bucket = ebikeBikeFaultHandleFile.getFileBucket();
+                String faultReportBucket = minioUtil.getFileUrl(bucket==null||bucket.isEmpty()?"fault-report-bucket": bucket, ebikeBikeFaultHandleFile.getFileUniqueKey());
                 resEbikeFaultHandleFileDto.setUrl(faultReportBucket);
             } catch (Exception e) {
                 throw new RuntimeException(e);

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeFaultreportReviewServiceImpl.java

@@ -27,7 +27,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 
 import static com.cdzy.ebikemaintenance.model.pojo.table.EbikeBikeFaultReportFileTableDef.EBIKE_BIKE_FAULT_REPORT_FILE;
 import static com.cdzy.ebikemaintenance.model.pojo.table.EbikeFaultreportReviewTableDef.EBIKE_FAULTREPORT_REVIEW;
@@ -62,6 +64,7 @@ public class EbikeFaultreportReviewServiceImpl extends ServiceImpl<EbikeFaultrep
                 entity.setIsDelete("1");
                 entity.setDeleteTime(LocalDateTime.now());
             }
+            save(entity);
             // 保存选择故障图片附件信息
             List<EbikeBikeFaultReportFile> attachmentFiles = ebikeFaultreportReview.getAttachmentFiles().stream().map(file -> {
                 EbikeBikeFaultReportFile attachmentFile = new EbikeBikeFaultReportFile();
@@ -85,15 +88,24 @@ public class EbikeFaultreportReviewServiceImpl extends ServiceImpl<EbikeFaultrep
             if (!userFaultreports.isEmpty()) {
                 ebikeUserFaultreportService.updateUserFaultreports(userFaultreports);
             }
-            save(entity);
             // 如果审查属实，直接上报
             if ("1".equals(entity.getResult())){
+                // 使用最后一次上报的故障信息上报的经纬度
+                Optional<ResEbikeUserFaultreportDto> last = ebikeFaultreportReview.getFaultReports().stream().max(
+                        Comparator.comparing(
+                                ResEbikeUserFaultreportDto::getReportAt,
+                                Comparator.nullsLast(Comparator.naturalOrder())
+                        ));
                 ReqEbikeBikeFaultReportDto faultReportDto = new ReqEbikeBikeFaultReportDto();
                 faultReportDto.setFaultPart(entity.getFaultParts());
                 faultReportDto.setFaultDescription(entity.getRemark());
                 faultReportDto.setBikeCode(entity.getBikeCode());
                 faultReportDto.setReportUser(entity.getReviewer());
                 faultReportDto.setReportSource("用户上报审查");
+                if(last.isPresent()){
+                    faultReportDto.setLongitude(last.get().getLongitude());
+                    faultReportDto.setLatitude(last.get().getLatitude());
+                }
                 // 附件（选择图片)
                 List<ReqEbikeFaultReportFileDto> attachmentFileDtos = attachmentFiles.stream().map(file -> {
                     ReqEbikeFaultReportFileDto dto = new ReqEbikeFaultReportFileDto();
@@ -181,7 +193,7 @@ public class EbikeFaultreportReviewServiceImpl extends ServiceImpl<EbikeFaultrep
             attachmentFile.setFileSize(fileDto.getFileSize());
             attachmentFile.setFileType(fileDto.getFileType());
             attachmentFile.setFileName(fileDto.getFileName());
-            attachmentFile.setUrl(fileDto.getFileUrl());
+            attachmentFile.setUrl(fileDto.getUrl());
             return attachmentFile;
         }).toList();
         faultReportDto.setReportAttachments(attachmentFiles);

ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeOrdersSystemInfoController.java

@@ -70,7 +70,7 @@ public class EbikeOrdersSystemInfoController {
             ebikeOrderAttachmentFileService.save(ebikeAttachmentFile);
             EbikeOrderAttachmentFileDto ebikeAttachmentFileDto = new EbikeOrderAttachmentFileDto();
             BeanUtils.copyProperties(ebikeAttachmentFile, ebikeAttachmentFileDto);
-            ebikeAttachmentFileDto.setFileUrl(minioFileUrl);
+            ebikeAttachmentFileDto.setUrl(minioFileUrl);
             return JsonResult.success(ebikeAttachmentFileDto);
         } catch (Exception e) {
             log.error("fileUpload===>{}", e.getMessage() + Arrays.toString(e.getStackTrace()));

ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserFaultreportController.java

@@ -104,7 +104,7 @@ public class EbikeUserFaultreportController {
                 .stream().map(attachmentFile ->{
                    EbikeOrderAttachmentFileDto attachmentFileDto = new EbikeOrderAttachmentFileDto();
                    BeanUtils.copyProperties(attachmentFile, attachmentFileDto);
-                    attachmentFileDto.setFileUrl(minioUtil.getBucketFileUrl(attachmentFile.getFileKey()));
+                    attachmentFileDto.setUrl(minioUtil.getBucketFileUrl(attachmentFile.getFileKey()));
                    return attachmentFileDto;
                 }).toList();
         dto.setAttachmentFiles(attachmentFiles);

ebike-orders/src/main/java/com/cdzy/orders/service/impl/EbikeUserFaultreportServiceImpl.java

@@ -118,7 +118,7 @@ public class EbikeUserFaultreportServiceImpl extends ServiceImpl<EbikeUserFaultr
                         EbikeOrderAttachmentFileDto attachmentFileDto = new EbikeOrderAttachmentFileDto();
                         BeanUtils.copyProperties(attachmentFile, attachmentFileDto);
                         attachmentFileDto.setFileBucket(MinioUtil.BUCKET_ORDERS);
-                        attachmentFileDto.setFileUrl(minioUtil.getBucketFileUrl(attachmentFile.getFileKey()));
+                        attachmentFileDto.setUrl(minioUtil.getBucketFileUrl(attachmentFile.getFileKey()));
                         return attachmentFileDto;
                     }).toList();
             dto.setAttachmentFiles(attachmentFiles);