From 04bf3bd199ceb1c299bcec07ef2811e1ea8bb38a Mon Sep 17 00:00:00 2001 From: jkcdev Date: Fri, 18 Apr 2025 16:57:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E6=A8=A1=E5=9D=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E2=86=92=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=95=85=E9=9A=9C=E4=B8=8A=E6=8A=A5=E2=86=92=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=B8=8A=E6=8A=A5=E7=8A=B6=E6=80=81=E5=9B=9E=E5=86=99?= =?UTF-8?q?=EF=BC=88=E5=B7=B2=E7=BB=8F=E5=AE=A1=E6=A0=B8=E8=BF=87=E4=BA=86?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/EbikeOrderAttachmentFileDto.java | 2 +- .../model/pojo/EbikeBikeFaultHandleFile.java | 5 +++++ .../impl/EbikeBikeInfoServiceImpl.java | 19 +++++++++++-------- .../EbikeFaultreportReviewServiceImpl.java | 16 ++++++++++++++-- .../EbikeOrdersSystemInfoController.java | 2 +- .../EbikeUserFaultreportController.java | 2 +- .../impl/EbikeUserFaultreportServiceImpl.java | 2 +- 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/ebike-common/src/main/java/com/cdzy/common/model/EbikeOrderAttachmentFileDto.java b/ebike-common/src/main/java/com/cdzy/common/model/EbikeOrderAttachmentFileDto.java index 3deb6bac..873efcea 100644 --- a/ebike-common/src/main/java/com/cdzy/common/model/EbikeOrderAttachmentFileDto.java +++ b/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; /** * 数据桶名 diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeBikeFaultHandleFile.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeBikeFaultHandleFile.java index 8eae3e29..bde7f23f 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/EbikeBikeFaultHandleFile.java +++ b/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; } diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java index 9b84a748..8cf9d529 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java @@ -432,15 +432,16 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl ebikeBikeFaultReportFiles = ebikeBikeFaultReportFileMapper.selectListByQuery(query); - ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto(); for (EbikeBikeFaultReportFile ebikeBikeFaultReportFile : ebikeBikeFaultReportFiles) { + ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto(); BeanUtils.copyProperties(ebikeBikeFaultReportFile, resEbikeFaultReportFileDto); - try { - String faultReportBucket = minioUtil.getFileUrl("fault-report-bucket", ebikeBikeFaultReportFile.getFileUniqueKey()); + //try { + String bucket = ebikeBikeFaultReportFile.getFileBucket(); + String faultReportBucket = minioUtil.getFileUrl2(bucket==null||bucket.isEmpty()? "fault-report-bucket": bucket, ebikeBikeFaultReportFile.getFileUniqueKey()); resEbikeFaultReportFileDto.setUrl(faultReportBucket); - } catch (Exception e) { - throw new RuntimeException(e); - } + //} catch (Exception e) { + // throw new RuntimeException(e); + //} fileList.add(resEbikeFaultReportFileDto); } } @@ -1013,7 +1014,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl attachmentFiles = ebikeFaultreportReview.getAttachmentFiles().stream().map(file -> { EbikeBikeFaultReportFile attachmentFile = new EbikeBikeFaultReportFile(); @@ -85,15 +88,24 @@ public class EbikeFaultreportReviewServiceImpl extends ServiceImpl 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 attachmentFileDtos = attachmentFiles.stream().map(file -> { ReqEbikeFaultReportFileDto dto = new ReqEbikeFaultReportFileDto(); @@ -181,7 +193,7 @@ public class EbikeFaultreportReviewServiceImpl extends ServiceImpl{}", e.getMessage() + Arrays.toString(e.getStackTrace())); diff --git a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserFaultreportController.java b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserFaultreportController.java index 7eb3b3f6..ddcce38b 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserFaultreportController.java +++ b/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); diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/EbikeUserFaultreportServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/EbikeUserFaultreportServiceImpl.java index 00e2baf7..60a865e8 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/EbikeUserFaultreportServiceImpl.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/EbikeUserFaultreportServiceImpl.java @@ -118,7 +118,7 @@ public class EbikeUserFaultreportServiceImpl extends ServiceImpl