diff --git a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java index a4a38849..e4e2e696 100644 --- a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java @@ -1240,54 +1240,6 @@ public class PrinterServiceImpl implements PrinterService { // 获取打印尺寸并裁剪图片 String cropUrl = resultImageUrl; // 默认使用原图 - try { - // 从打印机表获取尺寸 - Integer printWidth = null; - Integer printHeight = null; - - List printers = printerMapper.listByScenicId(scenicId); - if (printers != null && !printers.isEmpty()) { - PrinterResp firstPrinter = printers.get(0); - printWidth = firstPrinter.getPreferW(); - printHeight = firstPrinter.getPreferH(); - log.debug("从打印机获取尺寸: scenicId={}, printerId={}, width={}, height={}", - scenicId, firstPrinter.getId(), printWidth, printHeight); - } - - // 如果打印机没有配置或配置无效,使用默认值 - if (printWidth == null || printWidth <= 0) { - printWidth = 1020; - log.debug("打印机宽度未配置或无效,使用默认值: width={}", printWidth); - } - if (printHeight == null || printHeight <= 0) { - printHeight = 1520; - log.debug("打印机高度未配置或无效,使用默认值: height={}", printHeight); - } - - // 使用smartCropAndFill裁剪图片 - File croppedFile = ImageUtils.smartCropAndFill(resultImageUrl, printWidth, printHeight); - - try { - // 上传裁剪后的图片 - String[] split = croppedFile.getName().split("\\."); - String ext = split.length > 0 ? split[split.length - 1] : "jpg"; - - cropUrl = StorageFactory.use().uploadFile(null, croppedFile, "printer", UUID.randomUUID() + "." + ext); - - log.info("拼图照片裁剪成功: memberId={}, scenicId={}, puzzleRecordId={}, 原图={}, 裁剪后={}, 尺寸={}x{}", - memberId, scenicId, puzzleRecordId, resultImageUrl, cropUrl, printWidth, printHeight); - } finally { - // 清理临时文件 - if (croppedFile != null && croppedFile.exists()) { - croppedFile.delete(); - } - } - } catch (Exception e) { - log.error("拼图照片裁剪失败,使用原图: memberId={}, scenicId={}, puzzleRecordId={}, url={}", - memberId, scenicId, puzzleRecordId, resultImageUrl, e); - // 出现异常则使用原图 - cropUrl = resultImageUrl; - } entity.setCropUrl(cropUrl); entity.setStatus(0);