diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java index 1ae60682..81f677e0 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java @@ -362,22 +362,22 @@ public class EbikeBikeInfoController { public JsonResult fileUpload(@RequestParam("multipartFile") MultipartFile multipartFile) { try { - minioUtil.createBucket("fault-report-bucket"); + minioUtil.createBucket(MinioUtil.BUCKET_FAULT); InputStream inputStream = multipartFile.getInputStream(); String fileName = multipartFile.getOriginalFilename(); String fileUniqueKey = UUID.randomUUID() + fileName.substring(fileName.lastIndexOf(".")); - minioUtil.uploadFile(inputStream, "fault-report-bucket", fileUniqueKey); - String fileUrl = minioUtil.getFileUrl("fault-report-bucket", fileUniqueKey); + minioUtil.uploadFile(inputStream, MinioUtil.BUCKET_FAULT, fileUniqueKey); + String fileUrl = minioUtil.getFileUrl(MinioUtil.BUCKET_FAULT, fileUniqueKey); ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto(); resEbikeFaultReportFileDto.setUrl(fileUrl); resEbikeFaultReportFileDto.setFileUniqueKey(fileUniqueKey); - resEbikeFaultReportFileDto.setFileBucket("fault-report-bucket"); + //resEbikeFaultReportFileDto.setFileBucket(MinioUtil.BUCKET_FAULT); resEbikeFaultReportFileDto.setFileName(fileName); resEbikeFaultReportFileDto.setFileType(fileName.substring(fileName.lastIndexOf("."))); resEbikeFaultReportFileDto.setFileSize(multipartFile.getSize()); return JsonResult.success(resEbikeFaultReportFileDto); } catch (Exception e) { - log.error("fileUpload===>" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("fileUpload===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return JsonResult.failed("上传失败"); } } @@ -392,10 +392,10 @@ public class EbikeBikeInfoController { public JsonResult deletedFile(@RequestParam(name = "fileUniqueKey") String fileUniqueKey) { try { - minioUtil.deleteObject("fault-report-bucket", fileUniqueKey); + minioUtil.deleteObject(MinioUtil.BUCKET_FAULT, fileUniqueKey); return JsonResult.success("删除成功"); } catch (Exception e) { - log.error("deletedFile===>" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("deletedFile===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return JsonResult.failed("删除失败"); } } 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 8cf9d529..c4af90e2 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 @@ -146,7 +146,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("saveEbikeInfo===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return false; } } @@ -170,7 +170,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("updateEbikeHelmet===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return false; } } @@ -196,7 +196,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("updateEbikeEcu===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return false; } } @@ -245,7 +245,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("getBikeINfoData===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return null; } } @@ -311,7 +311,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("updateBikeQRCode===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return false; } } @@ -367,7 +367,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("vehicleLeaveWarehouse===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return false; } } @@ -399,7 +399,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("faultReporting===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return false; } } @@ -436,8 +436,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("inspectHaveOrNotWorkOrder===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return null; } @@ -682,7 +681,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("inspectBikeHaveOrNot===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return false; } } @@ -710,7 +709,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("getFaultReportList===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); } return resEbikeBikeFaultReportListDtos; } @@ -848,7 +847,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl" + e.getMessage() + Arrays.toString(e.getStackTrace())); + log.error("canCellWorkOrder===>{}", e.getMessage() + Arrays.toString(e.getStackTrace())); return false; } } @@ -1013,13 +1012,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl